Skip to content

Commit 8fe177a

Browse files
committed
prepare code generator for version 0.0.111
1 parent 61a9c10 commit 8fe177a

File tree

76 files changed

+3431
-675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3431
-675
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
126126
let noneOption = Option_AccessZ.none()
127127
let p2pGossipSync = P2PGossipSync(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
128128
self.graph_msg_handler = GossipSync.p2_p(a: p2pGossipSync)
129-
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: p2pGossipSync.as_RoutingMessageHandler())
129+
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: p2pGossipSync.as_RoutingMessageHandler(), onion_message_handler_arg: <#Bindings.OnionMessageHandler#>)
130130
} else {
131-
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
131+
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler(), onion_message_handler_arg: <#Bindings.OnionMessageHandler#>)
132132
}
133133
guard let nodeSecret = keys_interface.get_node_secret(recipient: LDKRecipient_Node).getValue() else {
134134
throw InvalidSerializedDataError.badNodeSecret
135135
}
136-
self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: nodeSecret, ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
136+
self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: nodeSecret, current_time: <#UInt64#>, ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
137137

138138
if let filter = filter {
139139
for (currentMonitor, _) in self.channel_monitors {
@@ -172,12 +172,12 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
172172
let noneOption = Option_AccessZ.none()
173173
let p2pGossipSync = P2PGossipSync(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
174174
self.graph_msg_handler = GossipSync.p2_p(a: p2pGossipSync)
175-
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: p2pGossipSync.as_RoutingMessageHandler())
175+
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: p2pGossipSync.as_RoutingMessageHandler(), onion_message_handler_arg: <#Bindings.OnionMessageHandler#>)
176176
} else {
177-
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
177+
messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler(), onion_message_handler_arg: <#Bindings.OnionMessageHandler#>)
178178
}
179179
let nodeSecret = keys_interface.get_node_secret(recipient: LDKRecipient_Node).getValue()!
180-
self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: nodeSecret, ephemeral_random_data: random_data, logger: logger, custom_message_handler: noCustomMessages.as_CustomMessageHandler())
180+
self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: nodeSecret, current_time: <#UInt64#>, ephemeral_random_data: random_data, logger: logger, custom_message_handler: noCustomMessages.as_CustomMessageHandler())
181181

182182

183183
super.init(conflictAvoidingVariableName: 0)
@@ -222,19 +222,19 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
222222
self.scorer = scorer
223223

224224
if let netGraph = self.net_graph, let scorer = self.scorer {
225-
let router = DefaultRouter(network_graph: netGraph, logger: self.logger, random_seed_bytes: self.keysInterface.get_secure_random_bytes())
225+
let router = DefaultRouter(network_graph: netGraph, logger: self.logger, random_seed_bytes: self.keysInterface.get_secure_random_bytes(), scorer: scorer.as_LockableScore())
226226
// either dangle router, or set is_owned to false
227227
scorer.cOpaqueStruct!.is_owned = false
228228
router.cOpaqueStruct!.is_owned = false
229-
self.payer = InvoicePayer(payer: self.channelManager.as_Payer(), router: router.as_Router(), scorer: scorer, logger: self.logger, event_handler: self.customEventHandler!, retry: Retry.attempts(a: 3))
229+
self.payer = InvoicePayer(payer: self.channelManager.as_Payer(), router: router.as_Router(), logger: self.logger, event_handler: self.customEventHandler!, retry: Retry.attempts(a: 3))
230230
router.cOpaqueStruct!.is_owned = true
231231
self.customEventHandler = self.payer!.as_EventHandler()
232232
}
233233

234234
// if there is a graph msg handler, set its is_owned to false
235235
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = false
236236

237-
self.backgroundProcessor = BackgroundProcessor(persister: self.customPersister!, event_handler: self.customEventHandler!, chain_monitor: self.chain_monitor, channel_manager: self.channelManager, gossip_sync: self.graph_msg_handler ?? GossipSync.none(), peer_manager: self.peerManager, logger: self.logger, scorer: self.scorer)
237+
self.backgroundProcessor = BackgroundProcessor(persister: self.customPersister!, event_handler: self.customEventHandler!, chain_monitor: self.chain_monitor, channel_manager: self.channelManager, gossip_sync: self.graph_msg_handler ?? GossipSync.none(), peer_manager: self.peerManager, logger: self.logger, scorer: self.scorer?.as_LockableScore())
238238

239239
// restore it back to true
240240
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = true

0 commit comments

Comments
 (0)