@@ -126,14 +126,15 @@ 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 ( ) , onion_message_handler_arg: < #Bindings . OnionMessageHandler# > )
129
+ messageHandler = MessageHandler ( chan_handler_arg: channelManager. as_ChannelMessageHandler ( ) , route_handler_arg: p2pGossipSync. as_RoutingMessageHandler ( ) , onion_message_handler_arg: noCustomMessages . as_OnionMessageHandler ( ) )
130
130
} else {
131
- messageHandler = MessageHandler ( chan_handler_arg: channelManager. as_ChannelMessageHandler ( ) , route_handler_arg: noCustomMessages. as_RoutingMessageHandler ( ) , onion_message_handler_arg: < #Bindings . OnionMessageHandler# > )
131
+ messageHandler = MessageHandler ( chan_handler_arg: channelManager. as_ChannelMessageHandler ( ) , route_handler_arg: noCustomMessages. as_RoutingMessageHandler ( ) , onion_message_handler_arg: noCustomMessages . as_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, current_time: < #UInt64 #> , ephemeral_random_data: random_data, logger: self . logger, custom_message_handler: IgnoringMessageHandler ( ) . as_CustomMessageHandler ( ) )
136
+ let timestampSeconds = UInt64 ( NSDate ( ) . timeIntervalSince1970)
137
+ self . peerManager = PeerManager ( message_handler: messageHandler. dangle ( ) , our_node_secret: nodeSecret, current_time: timestampSeconds, ephemeral_random_data: random_data, logger: self . logger, custom_message_handler: IgnoringMessageHandler ( ) . as_CustomMessageHandler ( ) )
137
138
138
139
if let filter = filter {
139
140
for (currentMonitor, _) in self . channel_monitors {
@@ -172,12 +173,13 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
172
173
let noneOption = Option_AccessZ . none ( )
173
174
let p2pGossipSync = P2PGossipSync ( network_graph: netGraph, chain_access: Option_AccessZ . none ( ) , logger: logger)
174
175
self . graph_msg_handler = GossipSync . p2_p ( a: p2pGossipSync)
175
- messageHandler = MessageHandler ( chan_handler_arg: channelManager. as_ChannelMessageHandler ( ) , route_handler_arg: p2pGossipSync. as_RoutingMessageHandler ( ) , onion_message_handler_arg: < #Bindings . OnionMessageHandler# > )
176
+ messageHandler = MessageHandler ( chan_handler_arg: channelManager. as_ChannelMessageHandler ( ) , route_handler_arg: p2pGossipSync. as_RoutingMessageHandler ( ) , onion_message_handler_arg: noCustomMessages . as_OnionMessageHandler ( ) )
176
177
} else {
177
- messageHandler = MessageHandler ( chan_handler_arg: channelManager. as_ChannelMessageHandler ( ) , route_handler_arg: noCustomMessages. as_RoutingMessageHandler ( ) , onion_message_handler_arg: < #Bindings . OnionMessageHandler# > )
178
+ messageHandler = MessageHandler ( chan_handler_arg: channelManager. as_ChannelMessageHandler ( ) , route_handler_arg: noCustomMessages. as_RoutingMessageHandler ( ) , onion_message_handler_arg: noCustomMessages . as_OnionMessageHandler ( ) )
178
179
}
179
180
let nodeSecret = keys_interface. get_node_secret ( recipient: LDKRecipient_Node) . getValue ( ) !
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 ( ) )
181
+ let timestampSeconds = UInt64 ( NSDate ( ) . timeIntervalSince1970)
182
+ self . peerManager = PeerManager ( message_handler: messageHandler. dangle ( ) , our_node_secret: nodeSecret, current_time: timestampSeconds, ephemeral_random_data: random_data, logger: logger, custom_message_handler: noCustomMessages. as_CustomMessageHandler ( ) )
181
183
182
184
183
185
super. init ( conflictAvoidingVariableName: 0 )
@@ -234,7 +236,8 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
234
236
// if there is a graph msg handler, set its is_owned to false
235
237
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = false
236
238
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 ( ) )
239
+ let scorerArgument = Option_WriteableScoreZ ( value: self . scorer? . as_WriteableScore ( ) )
240
+ 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: scorerArgument)
238
241
239
242
// restore it back to true
240
243
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = true
0 commit comments