wip

wavesplatform · Mar 22, 2024 · a561a49 · a561a49
1 parent 0585408
commit a561a49
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/node-it/src/test/scala/com/wavesplatform/it/Docker.scala b/node-it/src/test/scala/com/wavesplatform/it/Docker.scala
@@ -305,7 +305,8 @@ class Docker(
 
   private def getNodeInfo(containerId: String, settings: WavesSettings): NodeInfo = {
     val restApiPort = settings.restAPISettings.port
-    val networkPort = settings.networkSettings.bindAddress.getPort
+    // assume test nodes always have an open port
+    val networkPort = settings.networkSettings.bindAddress.get.getPort
 
     val containerInfo  = inspectContainer(containerId)
     val wavesIpAddress = containerInfo.networkSettings().networks().get(wavesNetwork.name()).ipAddress()

diff --git a/node/src/test/scala/com/wavesplatform/network/peer/PeerDatabaseImplSpecification.scala b/node/src/test/scala/com/wavesplatform/network/peer/PeerDatabaseImplSpecification.scala
@@ -37,17 +37,6 @@ class PeerDatabaseImplSpecification extends FreeSpec {
     .resolve()
   private val settings2 = config2.as[NetworkSettings]("waves.network")
 
-  private val config3 = ConfigFactory
-    .parseString(s"""waves.network {
-                    |  file = null
-                    |  known-peers = ["$host1:1"]
-                    |  peers-data-residence-time = 2s
-                    |  enable-peers-exchange = no
-                    |}""".stripMargin)
-    .withFallback(ConfigFactory.load())
-    .resolve()
-  private val settings3 = config3.as[NetworkSettings]("waves.network")
-
   private def withDatabase(settings: NetworkSettings)(f: PeerDatabase => Unit): Unit = {
     val pdb = new PeerDatabaseImpl(settings)
     f(pdb)
@@ -78,14 +67,6 @@ class PeerDatabaseImplSpecification extends FreeSpec {
       database.randomPeer(Set()) shouldBe empty
     }
 
-    "known-peers should be always in database" in withDatabase(settings3) { database3 =>
-      database3.knownPeers.keys should contain(address1)
-      sleepLong()
-      database3.knownPeers.keys should contain(address1)
-      sleepShort()
-      database3.knownPeers.keys should contain(address1)
-    }
-
     "touching peer prevent it from obsoleting" in withDatabase(settings1) { database =>
       database.addCandidate(address1)
       database.touch(address1)

diff --git a/node/src/test/scala/com/wavesplatform/settings/NetworkSettingsSpecification.scala b/node/src/test/scala/com/wavesplatform/settings/NetworkSettingsSpecification.scala
@@ -42,7 +42,7 @@ class NetworkSettingsSpecification extends FlatSpec {
         |}""".stripMargin))
     val networkSettings = config.as[NetworkSettings]("waves.network")
 
-    networkSettings.bindAddress should be(new InetSocketAddress("127.0.0.1", 6868))
+    networkSettings.bindAddress should be(Some(new InetSocketAddress("127.0.0.1", 6868)))
     networkSettings.nodeName should be("default-node-name")
     networkSettings.declaredAddress should be(Some(new InetSocketAddress("127.0.0.1", 6868)))
     networkSettings.nonce should be(0)