Don't load network graph twice on start-up

eclair-core/src/main/resources/reference.conf

@@ -438,7 +438,6 @@ eclair {
 
     channel-exclude-duration = 60 seconds // when a temporary channel failure is returned, we exclude the channel from our payment routes for this duration
     broadcast-interval = 60 seconds // see BOLT #7
-    init-timeout = 5 minutes
     balance-estimate-half-life = 1 day // time after which the confidence of the balance estimate is halved
 
     sync {

eclair-core/src/main/scala/fr/acinq/eclair/DBChecker.scala

@@ -17,8 +17,11 @@
 package fr.acinq.eclair
 
 import fr.acinq.eclair.channel.{ChannelDataWithCommitments, PersistentChannelData}
+import fr.acinq.eclair.router.Router
+import fr.acinq.eclair.wire.protocol.NodeAnnouncement
 import grizzled.slf4j.Logging
 
+import scala.collection.immutable.SortedMap
 import scala.util.{Failure, Success, Try}
 
 object DBChecker extends Logging {
@@ -47,9 +50,9 @@ object DBChecker extends Logging {
   /**
    * Tests if the network database is readable.
    */
-  def checkNetworkDB(nodeParams: NodeParams): Unit =
+  def checkNetworkDB(nodeParams: NodeParams): (SortedMap[RealShortChannelId, Router.PublicChannel], Seq[NodeAnnouncement]) =
     Try(nodeParams.db.network.listChannels(), nodeParams.db.network.listNodes()) match {
-      case Success(_) => ()
+      case Success((channels, nodes)) => (channels, nodes)
       case Failure(_) => throw IncompatibleNetworkDBException
     }
 }

eclair-core/src/main/scala/fr/acinq/eclair/Logs.scala

@@ -30,6 +30,7 @@ import fr.acinq.eclair.io.Peer.PeerRoutingMessage
 import fr.acinq.eclair.io.{Peer, PeerConnection}
 import fr.acinq.eclair.router.Router._
 import fr.acinq.eclair.router._
+import fr.acinq.eclair.wire.protocol
 import fr.acinq.eclair.wire.protocol._
 import grizzled.slf4j.Logger
 
@@ -153,7 +154,7 @@ object Logs {
         case _: PeerConnection.DelayedRebroadcast => Some(LogCategory.ROUTING_SYNC)
         case _: Ping => Some(LogCategory.CONNECTION)
         case _: Pong => Some(LogCategory.CONNECTION)
-        case _: Init => Some(LogCategory.CONNECTION)
+        case _: protocol.Init => Some(LogCategory.CONNECTION)
         case _: Rebroadcast => Some(LogCategory.ROUTING_SYNC)
 
         case _ => None

eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala

@@ -233,7 +233,7 @@ class Setup(val datadir: File,
       channelsListenerReady = Promise[Done]()
 
       channels = DBChecker.checkChannelsDB(nodeParams)
-      _ = DBChecker.checkNetworkDB(nodeParams)
+      (networkChannels, networkNodes) = DBChecker.checkNetworkDB(nodeParams)
 
       defaultFeerates = {
         val confDefaultFeerates = FeeratesPerKB(
@@ -341,9 +341,9 @@ class Setup(val datadir: File,
         system.spawn(Behaviors.supervise(ZmqWatcher(nodeParams, blockHeight, watcherBitcoinClient)).onFailure(typed.SupervisorStrategy.resume), "zmq-watcher")
       }
 
-      router = system.actorOf(SimpleSupervisor.props(Router.props(nodeParams, watcher, Some(routerInitialized)), "router", SupervisorStrategy.Resume))
-      routerTimeout = after(FiniteDuration(config.getDuration("router.init-timeout").getSeconds, TimeUnit.SECONDS), using = system.scheduler)(Future.failed(new RuntimeException("Router initialization timed out")))
-      _ <- Future.firstCompletedOf(routerInitialized.future :: routerTimeout :: Nil)
+      router = system.actorOf(SimpleSupervisor.props(Router.props(nodeParams, watcher), "router", SupervisorStrategy.Resume))
+      _ = router ! Router.Init(networkChannels, networkNodes, Some(routerInitialized))
+      _ <- routerInitialized.future
 
       _ = bitcoinClient.getReceiveAddress().map(address => logger.info(s"initial address=$address for bitcoin wallet=${bitcoinClient.rpcClient.wallet.getOrElse("(default)")}"))
       channelsListener = system.spawn(ChannelsListener(channelsListenerReady), name = "channels-listener")

eclair-core/src/main/scala/fr/acinq/eclair/remote/EclairInternalsSerializer.scala

@@ -24,9 +24,10 @@ import fr.acinq.eclair.io.Peer.PeerRoutingMessage
 import fr.acinq.eclair.io.Switchboard.RouterPeerConf
 import fr.acinq.eclair.io.{ClientSpawner, Peer, PeerConnection, Switchboard}
 import fr.acinq.eclair.payment.relay.Relayer.RelayFees
-import fr.acinq.eclair.router.Graph.{HeuristicsConstants, PaymentPathWeight, WeightRatios}
+import fr.acinq.eclair.router.Graph.HeuristicsConstants
 import fr.acinq.eclair.router.Router._
 import fr.acinq.eclair.router._
+import fr.acinq.eclair.wire.protocol
 import fr.acinq.eclair.wire.protocol.CommonCodecs._
 import fr.acinq.eclair.wire.protocol.LightningMessageCodecs._
 import fr.acinq.eclair.wire.protocol.QueryChannelRangeTlv.queryFlagsCodec
@@ -91,8 +92,8 @@ object EclairInternalsSerializer {
   val messageRouteParamsCodec: Codec[MessageRouteParams] = (
     ("maxRouteLength" | int32) ::
       (("baseFactor" | double) ::
-      ("ageFactor" | double) ::
-      ("capacityFactor" | double)).as[Graph.MessageWeightRatios]).as[MessageRouteParams]
+        ("ageFactor" | double) ::
+        ("capacityFactor" | double)).as[Graph.MessageWeightRatios]).as[MessageRouteParams]
 
   val syncConfCodec: Codec[Router.SyncConf] = (
     ("requestNodeAnnouncements" | bool(8)) ::
@@ -136,7 +137,7 @@ object EclairInternalsSerializer {
 
   val peerConnectionKillCodec: Codec[PeerConnection.Kill] = peerConnectionKillReasonCodec.as[PeerConnection.Kill]
 
-  val lengthPrefixedInitCodec: Codec[Init] = variableSizeBytes(uint16, initCodec)
+  val lengthPrefixedInitCodec: Codec[protocol.Init] = variableSizeBytes(uint16, initCodec)
   val lengthPrefixedNodeAnnouncementCodec: Codec[NodeAnnouncement] = variableSizeBytes(uint16, nodeAnnouncementCodec)
   val lengthPrefixedChannelAnnouncementCodec: Codec[ChannelAnnouncement] = variableSizeBytes(uint16, channelAnnouncementCodec)
   val lengthPrefixedChannelUpdateCodec: Codec[ChannelUpdate] = variableSizeBytes(uint16, channelUpdateCodec)