Skip to content

Commit 3f1589c

Browse files
committed
Update battery Swift files for 0.1.0
1 parent 0e8d176 commit 3f1589c

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,18 @@ public struct ChannelManagerConstructionParameters {
104104
)
105105
.asRouter()
106106
}
107-
return CMCRouter(messageRouter: MessageRouter())
107+
return CMCRouter()
108+
}
109+
110+
private class CMCMessageRouter: MessageRouter {
111+
112+
}
113+
114+
fileprivate func messageRouter(networkGraph: NetworkGraph?) -> MessageRouter {
115+
if let netGraph = networkGraph {
116+
return DefaultMessageRouter(networkGraph: netGraph, entropySource: self.entropySource).asMessageRouter()
117+
}
118+
return CMCMessageRouter()
108119
}
109120
}
110121

@@ -192,10 +203,12 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
192203

193204
// TODO: figure out better way to obtain a router
194205
let router = params.router(networkGraph: self.netGraph)
206+
let messageRouter = params.messageRouter(networkGraph: self.netGraph)
195207
let channelManagerReadArgs = ChannelManagerReadArgs(
196208
entropySource: params.entropySource, nodeSigner: params.nodeSigner, signerProvider: params.signerProvider,
197209
feeEstimator: params.feeEstimator, chainMonitor: params.chainMonitor.asWatch(),
198-
txBroadcaster: params.txBroadcaster, router: router, logger: params.logger, defaultConfig: params.config,
210+
txBroadcaster: params.txBroadcaster, router: router, messageRouter: messageRouter, logger: params.logger,
211+
defaultConfig: params.config,
199212
channelMonitors: monitors)
200213

201214
guard
@@ -272,10 +285,11 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
272285

273286
self.netGraph = netGraph
274287
let router = params.router(networkGraph: self.netGraph)
288+
let messageRouter = params.messageRouter(networkGraph: self.netGraph)
275289
let timestampSeconds = UInt32(NSDate().timeIntervalSince1970)
276290
self.channelManager = ChannelManager(
277291
feeEst: params.feeEstimator, chainMonitor: params.chainMonitor.asWatch(),
278-
txBroadcaster: params.txBroadcaster, router: router, logger: params.logger,
292+
txBroadcaster: params.txBroadcaster, router: router, messageRouter: messageRouter, logger: params.logger,
279293
entropySource: params.entropySource, nodeSigner: params.nodeSigner, signerProvider: params.signerProvider,
280294
config: params.config, params: chainParameters, currentTimestamp: timestampSeconds)
281295

@@ -355,6 +369,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
355369
nodeIdLookup: NodeIdLookUp(), messageRouter: MessageRouter(),
356370
offersHandler: self.channelManager.asOffersMessageHandler(),
357371
asyncPaymentsHandler: ignoringMessageHandler.asAsyncPaymentsMessageHandler(),
372+
dnsResolver: ignoringMessageHandler.asDNSResolverMessageHandler(),
358373
customHandler: ignoringMessageHandler.asCustomOnionMessageHandler())
359374

360375
// if there is a graph msg handler, set its is_owned to false

0 commit comments

Comments
 (0)