Allow passing either serialized or instantiated network graph to channel manager deserializer.

Author: arik-so

ci/LDKSwift/Sources/LDKSwift/batteries/ChannelManagerConstructor.swift

@@ -23,6 +23,11 @@ enum RouterUnavailableError: Error {
     case channelManagerInitializationMissingScorerOrNetworkGraph
 }
 
+public enum NetworkGraphArgument {
+    case serialized([UInt8])
+    case instance(NetworkGraph)
+}
+
 public struct ChannelManagerConstructionParameters {
     public var config: UserConfig
     public var entropySource: EntropySource
@@ -109,7 +114,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
     public private(set) var channel_monitors: [(ChannelMonitor, [UInt8])]
 
 
-    public init(channelManagerSerialized: [UInt8], channelMonitorsSerialized: [[UInt8]], netGraphSerialized: [UInt8]?, filter: Filter?, params: ChannelManagerConstructionParameters) throws {
+    public init(channelManagerSerialized: [UInt8], channelMonitorsSerialized: [[UInt8]], networkGraph: NetworkGraphArgument?, filter: Filter?, params: ChannelManagerConstructionParameters) throws {
 
         self.constructionParameters = params
 
@@ -141,12 +146,18 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
         print("Collected channel monitors, reading channel manager")
 
-        if let serializedNetworkGraph = netGraphSerialized {
-            let netGraphResult = NetworkGraph.read(ser: serializedNetworkGraph, arg: params.logger)
-            if !netGraphResult.isOk(){
-                throw InvalidSerializedDataError.invalidSerializedNetworkGraph
+        if let netGraph = networkGraph {
+            switch netGraph {
+            case .instance(let graph):
+                self.netGraph = graph
+            case .serialized(let serializedNetworkGraph):
+                let netGraphResult = NetworkGraph.read(ser: serializedNetworkGraph, arg: params.logger)
+                if !netGraphResult.isOk(){
+                    throw InvalidSerializedDataError.invalidSerializedNetworkGraph
+                }
+                self.netGraph = netGraphResult.getValue()
             }
-            self.netGraph = netGraphResult.getValue()
+            
         }
 
         // TODO: figure out better way to obtain a router
@@ -170,7 +181,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
         let noCustomMessages = IgnoringMessageHandler()
         var messageHandler: MessageHandler!
-        if let netGraph = netGraph, params.enableP2PGossip {
+        if let netGraph = self.netGraph, params.enableP2PGossip {
             let p2pGossipSync = P2PGossipSync(networkGraph: netGraph, utxoLookup: nil, logger: params.logger)
             self.graphMessageHandler = GossipSync.initWithP2P(a: p2pGossipSync)
             messageHandler = MessageHandler(chanHandlerArg: channelManager.asChannelMessageHandler(), routeHandlerArg: p2pGossipSync.asRoutingMessageHandler(), onionMessageHandlerArg: noCustomMessages.asOnionMessageHandler())

ci/LDKSwift/Tests/LDKSwiftTests/LDKSwiftTests.swift

@@ -70,7 +70,7 @@ class LDKSwiftTests: XCTestCase {
             txBroadcaster: broadcaster,
             logger: logger
         )
-        let channelManagerConstructor = try ChannelManagerConstructor(channelManagerSerialized: serialized_channel_manager, channelMonitorsSerialized: serializedChannelMonitors, netGraphSerialized: nil, filter: filter, params: constructionParameters)
+        let channelManagerConstructor = try ChannelManagerConstructor(channelManagerSerialized: serialized_channel_manager, channelMonitorsSerialized: serializedChannelMonitors, networkGraph: nil, filter: filter, params: constructionParameters)
 
         let channelManager = channelManagerConstructor.channelManager;
         let cmPersister = TestChannelManagerPersister(channelManager: channelManager)