@@ -126,14 +126,14 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
126
126
let noneOption = Option_AccessZ . none ( )
127
127
let p2pGossipSync = P2PGossipSync ( network_graph: netGraph, chain_access: Option_AccessZ . none ( ) , logger: logger)
128
128
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# > )
130
130
} 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# > )
132
132
}
133
133
guard let nodeSecret = keys_interface. get_node_secret ( recipient: LDKRecipient_Node) . getValue ( ) else {
134
134
throw InvalidSerializedDataError . badNodeSecret
135
135
}
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 : < #UInt 64 # > , ephemeral_random_data: random_data, logger: self . logger, custom_message_handler: IgnoringMessageHandler ( ) . as_CustomMessageHandler ( ) )
137
137
138
138
if let filter = filter {
139
139
for (currentMonitor, _) in self . channel_monitors {
@@ -172,12 +172,12 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
172
172
let noneOption = Option_AccessZ . none ( )
173
173
let p2pGossipSync = P2PGossipSync ( network_graph: netGraph, chain_access: Option_AccessZ . none ( ) , logger: logger)
174
174
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# > )
176
176
} 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# > )
178
178
}
179
179
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 : < #UInt 64 # > , ephemeral_random_data: random_data, logger: logger, custom_message_handler: noCustomMessages. as_CustomMessageHandler ( ) )
181
181
182
182
183
183
super. init ( conflictAvoidingVariableName: 0 )
@@ -222,19 +222,19 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
222
222
self . scorer = scorer
223
223
224
224
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 ( ) )
226
226
// either dangle router, or set is_owned to false
227
227
scorer. cOpaqueStruct!. is_owned = false
228
228
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 ) )
230
230
router. cOpaqueStruct!. is_owned = true
231
231
self . customEventHandler = self . payer!. as_EventHandler ( )
232
232
}
233
233
234
234
// if there is a graph msg handler, set its is_owned to false
235
235
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = false
236
236
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 ( ) )
238
238
239
239
// restore it back to true
240
240
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = true
0 commit comments