diff --git a/node-test/src/test/scala/org/bitcoins/node/networking/ReConnectionTest.scala b/node-test/src/test/scala/org/bitcoins/node/networking/ReConnectionTest.scala index c320ce02c0..2e6ca0847c 100644 --- a/node-test/src/test/scala/org/bitcoins/node/networking/ReConnectionTest.scala +++ b/node-test/src/test/scala/org/bitcoins/node/networking/ReConnectionTest.scala @@ -79,6 +79,7 @@ class ReConnectionTest extends NodeTestWithCachedBitcoindNewest { //wait until there is a timeout for inactivity _ <- NodeTestUtil.awaitConnectionCount(started, 1) + _ <- started.peerManager.isConnected(bitcoindPeer) _ <- started.stop() _ <- started.nodeConfig.stop() } yield { diff --git a/node/src/main/scala/org/bitcoins/node/NeutrinoNode.scala b/node/src/main/scala/org/bitcoins/node/NeutrinoNode.scala index 26ef86c823..22d5e92c3c 100644 --- a/node/src/main/scala/org/bitcoins/node/NeutrinoNode.scala +++ b/node/src/main/scala/org/bitcoins/node/NeutrinoNode.scala @@ -20,7 +20,6 @@ import org.bitcoins.chain.config.ChainAppConfig import org.bitcoins.core.api.chain.ChainQueryApi.FilterResponse import NodeState.DoneSyncing import org.bitcoins.core.api.node.{NodeType, Peer} -import org.bitcoins.core.config.{MainNet, RegTest, SigNet, TestNet3} import org.bitcoins.core.protocol.BlockStamp import org.bitcoins.node.config.NodeAppConfig @@ -201,7 +200,7 @@ case class NeutrinoNode( private def inactivityChecksRunnable(): Runnable = { () => val peers = peerManager.peers - logger.debug(s"Running inactivity checks for peers=${peers}") + logger.info(s"Running inactivity checks for peers=${peers}") val resultF = if (peers.nonEmpty) { Future.unit //do nothing? } else if (isStarted.get) { @@ -220,11 +219,7 @@ case class NeutrinoNode( } private def startInactivityChecksJob(): Cancellable = { - //the interval is set shorter for some unit test cases - val interval = nodeAppConfig.network match { - case MainNet | TestNet3 | SigNet => 5.minute - case RegTest => nodeAppConfig.inactivityTimeout - } + val interval = nodeAppConfig.inactivityTimeout system.scheduler.scheduleAtFixedRate( initialDelay = interval, interval = interval)(inactivityChecksRunnable()) diff --git a/node/src/main/scala/org/bitcoins/node/PeerManager.scala b/node/src/main/scala/org/bitcoins/node/PeerManager.scala index da2cd5996a..c4f33e5d36 100644 --- a/node/src/main/scala/org/bitcoins/node/PeerManager.scala +++ b/node/src/main/scala/org/bitcoins/node/PeerManager.scala @@ -378,9 +378,9 @@ case class PeerManager( if (forceReconnect && !isShuttingDown) { finder.reconnect(peer).map(_ => state) } else { - val exn = new RuntimeException( + logger.warn( s"No new peers to sync from, cannot start new sync. Terminated sync with peer=$peer current syncPeer=$syncPeerOpt state=${state} peers=$peers") - Future.failed(exn) + Future.successful(state) } } else { if (forceReconnect && !isShuttingDown) {