use string type for ip parameter

renproject · Mar 25, 2021 · b6e78b1 · b6e78b1
1 parent ac98f51
commit b6e78b1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/channel/channel_suite_test.go b/channel/channel_suite_test.go
@@ -25,7 +25,7 @@ func TestChannel(t *testing.T) {
 }
 
 func listen(ctx context.Context, attacher channel.Attacher, self, other id.Signatory) int {
-	ip := net.IPv4(127, 0, 0, 1)
+	ip := "127.0.0.1"
 	listener, port, err := tcp.ListenerWithAssignedPort(ctx, ip)
 	Expect(err).ToNot(HaveOccurred())
 	go func() {

diff --git a/handshake/handshake_test.go b/handshake/handshake_test.go
@@ -79,7 +79,7 @@ func listenOnAssignedPort(ctx context.Context) <-chan int {
 		privKey := id.NewPrivKey()
 		h := handshake.ECIES(privKey)
 
-		ip := net.IPv4(127, 0, 0, 1)
+		ip := "127.0.0.1"
 		listener, port, err := tcp.ListenerWithAssignedPort(ctx, ip)
 		Expect(err).ToNot(HaveOccurred())
 		portCh <- port

diff --git a/handshake/once_test.go b/handshake/once_test.go
@@ -33,7 +33,7 @@ var _ = Describe("Handshake", func() {
 				handshakeDone2 := make(chan struct{}, 1)
 				serverHandshakeDone := make(chan struct{}, 2)
 
-				ip := net.IPv4(127, 0, 0, 1)
+				ip := "127.0.0.1"
 				portCh1 := make(chan int, 1)
 				portCh2 := make(chan int, 1)
 
@@ -139,7 +139,7 @@ var _ = Describe("Handshake", func() {
 				handshakeDone2 := make(chan struct{}, 1)
 				serverHandshakeDone := make(chan struct{}, 2)
 
-				ip := net.IPv4(127, 0, 0, 1)
+				ip := "127.0.0.1"
 				portCh := make(chan int, 1)
 
 				var connectionKillCount int64 = 0

diff --git a/tcp/tcp.go b/tcp/tcp.go
@@ -94,8 +94,8 @@ func ListenWithListener(ctx context.Context, listener net.Listener, handle func(
 
 // ListenerWithAssignedPort creates a new listener on a random port assigned by
 // the OS. On success, both the listener and port are returned.
-func ListenerWithAssignedPort(ctx context.Context, ip net.IP) (net.Listener, int, error) {
-	listener, err := new(net.ListenConfig).Listen(ctx, "tcp", fmt.Sprintf("%v:%v", ip.String(), 0))
+func ListenerWithAssignedPort(ctx context.Context, ip string) (net.Listener, int, error) {
+	listener, err := new(net.ListenConfig).Listen(ctx, "tcp", fmt.Sprintf("%v:%v", ip, 0))
 	if err != nil {
 		return nil, 0, err
 	}

diff --git a/tcp/tcp_test.go b/tcp/tcp_test.go
@@ -45,7 +45,7 @@ var _ = Describe("TCP", func() {
 			}
 			var listener net.Listener
 			var err error
-			ip := net.IPv4(127, 0, 0, 1)
+			ip := "127.0.0.1"
 			listener, port, err = tcp.ListenerWithAssignedPort(ctx, ip)
 			Expect(err).ToNot(HaveOccurred())
 			go func() {