From eb834e2522eb71f410f05300f8937a862c4c83dd Mon Sep 17 00:00:00 2001 From: Pierre-Marie Padiou Date: Wed, 14 Apr 2021 10:38:38 +0200 Subject: [PATCH] Do not explicitly provide address for ServerSocket in tests (#1766) --- .../src/test/scala/fr/acinq/eclair/io/PeerSpec.scala | 6 +++--- .../scala/fr/acinq/eclair/io/ReconnectionTaskSpec.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerSpec.scala index 619a552da0..22a88b3ae3 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerSpec.scala @@ -37,7 +37,7 @@ import org.scalatest.funsuite.FixtureAnyFunSuiteLike import org.scalatest.{Outcome, ParallelTestExecution, Tag} import scodec.bits.ByteVector -import java.net.{InetAddress, ServerSocket, Socket} +import java.net.{ServerSocket, Socket} import java.util.concurrent.Executors import scala.concurrent.duration._ import scala.concurrent.{ExecutionContext, Future} @@ -113,7 +113,7 @@ class PeerSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with Paralle system.actorOf(ClientSpawner.props(nodeParams.keyPair, nodeParams.socksProxy_opt, nodeParams.peerConnectionConf, TestProbe().ref, TestProbe().ref)) // we create a dummy tcp server and update bob's announcement to point to it - val mockServer = new ServerSocket(0, 1, InetAddress.getLocalHost) // port will be assigned automatically + val mockServer = new ServerSocket(0, 1) // port will be assigned automatically val mockAddress = HostAndPort.fromParts(mockServer.getInetAddress.getHostAddress, mockServer.getLocalPort) val probe = TestProbe() @@ -139,7 +139,7 @@ class PeerSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with Paralle system.actorOf(ClientSpawner.props(nodeParams.keyPair, nodeParams.socksProxy_opt, nodeParams.peerConnectionConf, TestProbe().ref, TestProbe().ref)) // we create a dummy tcp server and update bob's announcement to point to it - val mockServer = new ServerSocket(0, 1, InetAddress.getLocalHost) // port will be assigned automatically + val mockServer = new ServerSocket(0, 1) // port will be assigned automatically val mockAddress = NodeAddress.fromParts(mockServer.getInetAddress.getHostAddress, mockServer.getLocalPort).get // we put the server address in the node db diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/io/ReconnectionTaskSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/io/ReconnectionTaskSpec.scala index 10bb7eb4ba..e3365bab6c 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/io/ReconnectionTaskSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/io/ReconnectionTaskSpec.scala @@ -25,7 +25,7 @@ import fr.acinq.eclair.wire.protocol.{Color, NodeAddress, NodeAnnouncement} import org.scalatest.funsuite.FixtureAnyFunSuiteLike import org.scalatest.{Outcome, ParallelTestExecution, Tag} -import java.net.{InetAddress, ServerSocket} +import java.net.ServerSocket import scala.concurrent.duration._ class ReconnectionTaskSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with ParallelTestExecution { @@ -222,7 +222,7 @@ class ReconnectionTaskSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike import f._ // we create a dummy tcp server and update bob's announcement to point to it - val mockServer = new ServerSocket(0, 1, InetAddress.getLocalHost) // port will be assigned automatically + val mockServer = new ServerSocket(0, 1) // port will be assigned automatically val mockAddress = NodeAddress.fromParts(mockServer.getInetAddress.getHostAddress, mockServer.getLocalPort).get val bobAnnouncement = NodeAnnouncement(randomBytes64, Features.empty, 1, remoteNodeId, Color(100.toByte, 200.toByte, 300.toByte), "node-alias", mockAddress :: Nil) nodeParams.db.network.addNode(bobAnnouncement)