fix for supporting changed ip format xxx.xxx.xxx.xxx:xxxx(x)

DE-labtory · Sep 17, 2018 · 33c7186 · 33c7186
1 parent cd0038d
commit 33c7186
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/client/client_test.go b/client/client_test.go
@@ -54,5 +54,5 @@ func TestDial(t *testing.T) {
 
 	// then
 	assert.NoError(t, err)
-	assert.Equal(t, testConn.GetIP(), serverIP)
+	assert.Equal(t, testConn.GetIP(), bifrost.Address{serverIP})
 }
diff --git a/conn_test.go b/conn_test.go
@@ -61,7 +61,7 @@ func TestGrpcConnection_Send(t *testing.T) {
 	}}
 	crypto := bifrost.GetMockCrypto()
 
-	conn, err := bifrost.NewConnection("127.0.0.1", keyOpts.PubKey, mockStreamWrapper, crypto)
+	conn, err := bifrost.NewConnection("127.0.0.1:1234", keyOpts.PubKey, mockStreamWrapper, crypto)
 
 	mockStreamWrapper.SendCallBack = func(envelope *pb.Envelope) {
 		//then
@@ -88,7 +88,7 @@ func TestGrpcConnection_GetPeerKey(t *testing.T) {
 	mockStreamWrapper := bifrost.MockStreamWrapper{}
 	crypto := bifrost.GetMockCrypto()
 
-	conn, err := bifrost.NewConnection("127.0.0.1", keyOpts.PubKey, mockStreamWrapper, crypto)
+	conn, err := bifrost.NewConnection("127.0.0.1:1234", keyOpts.PubKey, mockStreamWrapper, crypto)
 	assert.NoError(t, err)
 
 	go func() {
@@ -119,7 +119,7 @@ func TestGrpcConnection_Close(t *testing.T) {
 	}
 	crypto := bifrost.GetMockCrypto()
 
-	conn, err := bifrost.NewConnection("127.0.0.1", keyOpts.PubKey, mockStreamWrapper, crypto)
+	conn, err := bifrost.NewConnection("127.0.0.1:1234", keyOpts.PubKey, mockStreamWrapper, crypto)
 	assert.NoError(t, err)
 
 	go func() {
@@ -132,3 +132,15 @@ func TestGrpcConnection_Close(t *testing.T) {
 	conn.Close()
 	wg.Wait()
 }
+
+func TestGrpcConnection_GetIP(t *testing.T) {
+	keyOpts := bifrost.GetKeyOpts()
+
+	mockStreamWrapper := bifrost.MockStreamWrapper{}
+	crypto := bifrost.GetMockCrypto()
+
+	conn, err := bifrost.NewConnection("127.0.0.1:1234", keyOpts.PubKey, mockStreamWrapper, crypto)
+	assert.NoError(t, err)
+	ipAddr := conn.GetIP()
+	assert.Equal(t, bifrost.Address{IP: "127.0.0.1:1234"}, ipAddr)
+}
diff --git a/mux/mux_test.go b/mux/mux_test.go
@@ -30,7 +30,7 @@ func TestMux_ServeRequest(t *testing.T) {
 
 func TestMux_ServeError(t *testing.T) {
 	// given
-	targetIP := "127.0.0.1"
+	targetIP := "127.0.0.1:1234"
 	testMux := mux.New()
 
 	testMux.HandleError(func(conn bifrost.Connection, err error) {

diff --git a/store_test.go b/store_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestConnectionStore_AddConnection(t *testing.T) {
 	testConnStroe := bifrost.NewConnectionStore()
-	testConn, err := bifrost.GetMockConnection("127.0.0.1")
+	testConn, err := bifrost.GetMockConnection("127.0.0.1:1234")
 	assert.NoError(t, err)
 
 	err = testConnStroe.AddConnection(testConn)
@@ -18,7 +18,7 @@ func TestConnectionStore_AddConnection(t *testing.T) {
 
 func TestConnectionStore_DeleteConnection(t *testing.T) {
 	testConnStore := bifrost.NewConnectionStore()
-	testConn, err := bifrost.GetMockConnection("127.0.0.1")
+	testConn, err := bifrost.GetMockConnection("127.0.0.1:1234")
 	assert.NoError(t, err)
 
 	err = testConnStore.AddConnection(testConn)
@@ -33,7 +33,7 @@ func TestConnectionStore_DeleteConnection(t *testing.T) {
 
 func TestConnectionStore_GetConnection(t *testing.T) {
 	testConnStore := bifrost.NewConnectionStore()
-	testConn, err := bifrost.GetMockConnection("127.0.0.1")
+	testConn, err := bifrost.GetMockConnection("127.0.0.1:1234")
 	assert.NoError(t, err)
 
 	err = testConnStore.AddConnection(testConn)