Skip to content

Commit 4a9b00d

Browse files
committed
Update MultiThreadedLockableScore for 0.0.111
1 parent 8fe177a commit 4a9b00d

File tree

4 files changed

+3796
-3557
lines changed

4 files changed

+3796
-3557
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,15 @@ 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(), 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())
130130
} 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())
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, 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())
137138

138139
if let filter = filter {
139140
for (currentMonitor, _) in self.channel_monitors {
@@ -172,12 +173,13 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
172173
let noneOption = Option_AccessZ.none()
173174
let p2pGossipSync = P2PGossipSync(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
174175
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())
176177
} 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())
178179
}
179180
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())
181183

182184

183185
super.init(conflictAvoidingVariableName: 0)
@@ -234,7 +236,8 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
234236
// if there is a graph msg handler, set its is_owned to false
235237
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = false
236238

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)
238241

239242
// restore it back to true
240243
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = true

ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6838,7 +6838,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
68386838
*/
68396839

68406840
public class func get_ldk_swift_bindings_version() -> String {
6841-
return "61a9c100adcdb0bd928dac9dd48369fa6dbf6b94"
6841+
return "8fe177ad2a9b39971f2c73730f4516d16d6b424c"
68426842
}
68436843

68446844
}

ci/LDKSwift/Sources/LDKSwift/bindings/structs/MultiThreadedLockableScore.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,20 @@ MultiThreadedLockableScore_as_LockableScore(this_argPointer)
5151
}, anchor: self);
5252
}
5353

54+
public func write() -> [UInt8] {
55+
56+
return Bindings.LDKCVec_u8Z_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (objPointer: UnsafePointer<LDKMultiThreadedLockableScore>) in
57+
MultiThreadedLockableScore_write(objPointer)
58+
});
59+
}
60+
61+
public func as_WriteableScore() -> NativelyImplementedWriteableScore {
62+
63+
return NativelyImplementedWriteableScore(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKMultiThreadedLockableScore>) in
64+
MultiThreadedLockableScore_as_WriteableScore(this_argPointer)
65+
}, anchor: self);
66+
}
67+
5468
internal func free() -> Void {
5569

5670
return MultiThreadedLockableScore_free(self.cOpaqueStruct!);

0 commit comments

Comments
 (0)