Skip to content

Commit 7ddf265

Browse files
arik-soarik-so
committed
Re-fix batteries for 108
1 parent f86daf8 commit 7ddf265

File tree

4 files changed

+11
-35
lines changed

4 files changed

+11
-35
lines changed

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#if SWIFT_PACKAGE
99
import LDKHeaders
10-
import LDKBindings
1110
#endif
1211

1312
import Foundation
@@ -37,7 +36,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
3736
fileprivate var customPersister: CustomChannelManagerPersister?
3837
fileprivate var customEventHandler: EventHandler?
3938
public private(set) var net_graph: NetworkGraph?
40-
fileprivate var graph_msg_handler: NetGraphMsgHandler?
39+
fileprivate var graph_msg_handler: GossipSync?
4140
fileprivate var scorer: MultiThreadedLockableScore?
4241
fileprivate let keysInterface: KeysInterface!
4342
public private(set) var payer: InvoicePayer?
@@ -111,7 +110,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
111110
let random_data = keys_interface.get_secure_random_bytes();
112111

113112
if let serializedNetworkGraph = net_graph_serialized {
114-
let netGraphResult = NetworkGraph.read(ser: serializedNetworkGraph)
113+
let netGraphResult = NetworkGraph.read(ser: serializedNetworkGraph, arg: self.logger)
115114
if !netGraphResult.isOk(){
116115
throw InvalidSerializedDataError.invalidSerializedNetworkGraph
117116
}
@@ -121,7 +120,8 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
121120
let noCustomMessages = IgnoringMessageHandler()
122121
var messageHandler: MessageHandler!
123122
if let netGraph = net_graph {
124-
self.graph_msg_handler = NetGraphMsgHandler(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
123+
// TODO: fix
124+
// self.graph_msg_handler = NetGraphMsgHandler(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
125125

126126
// messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: self.graph_msg_handler!.as_RoutingMessageHandler())
127127
// temporarily disable handling routing messages by the peer manager to avoid excessive memory growth
@@ -169,7 +169,9 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
169169
var messageHandler: MessageHandler!
170170
if let netGraph = net_graph {
171171
let noneOption = Option_AccessZ.none()
172-
self.graph_msg_handler = NetGraphMsgHandler(network_graph: netGraph, chain_access: noneOption, logger: logger)
172+
173+
// TODO: fix
174+
// self.graph_msg_handler = NetGraphMsgHandler(network_graph: netGraph, chain_access: noneOption, logger: logger)
173175

174176

175177
// messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: self.graph_msg_handler!.as_RoutingMessageHandler())
@@ -227,18 +229,18 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
227229
let router = DefaultRouter(network_graph: netGraph, logger: self.logger, random_seed_bytes: self.keysInterface.get_secure_random_bytes())
228230
// either dangle router, or set is_owned to false
229231
router.cOpaqueStruct!.is_owned = false
230-
self.payer = InvoicePayer(payer: self.channelManager.as_Payer(), router: router.as_Router(), scorer: scorer, logger: self.logger, event_handler: self.customEventHandler!, retry_attempts: RetryAttempts(a_arg: 3))
232+
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))
231233
router.cOpaqueStruct!.is_owned = true
232234
self.customEventHandler = self.payer!.as_EventHandler()
233235
}
234236

235237
// if there is a graph msg handler, set its is_owned to false
236-
self.graph_msg_handler?.cOpaqueStruct?.is_owned = false
238+
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = false
237239

238-
self.backgroundProcessor = BackgroundProcessor(persister: self.customPersister!, event_handler: self.customEventHandler!, chain_monitor: self.chain_monitor, channel_manager: self.channelManager, net_graph_msg_handler: self.graph_msg_handler, peer_manager: self.peerManager, logger: self.logger)
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, peer_manager: self.peerManager, logger: self.logger, scorer: Option_WriteableScoreZ.none())
239241

240242
// restore it back to true
241-
self.graph_msg_handler?.cOpaqueStruct?.is_owned = true
243+
// self.graph_msg_handler?.cOpaqueStruct?.is_owned = true
242244

243245
try? self.backgroundProcessor!.addAnchor(anchor: self.peerManager)
244246
try? self.backgroundProcessor!.addAnchor(anchor: persister)

‎ci/LDKSwift/Sources/LDKSwift/batteries/NetGraphMsgHandlerConstructor.swift

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎ci/LDKSwift/Sources/LDKSwift/batteries/UtilMethods.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#if SWIFT_PACKAGE
99
import LDKHeaders
10-
import LDKBindings
1110
#endif
1211

1312
import Foundation

‎xcode/LDKFramework/LDKFramework.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,6 @@
363363
07D3E7BE286C0B710095CCD8 /* InvoicePayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3E666286C0B700095CCD8 /* InvoicePayer.swift */; };
364364
07D3E7BF286C0B710095CCD8 /* DelayedPaymentOutputDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3E667286C0B700095CCD8 /* DelayedPaymentOutputDescriptor.swift */; };
365365
07D3E7C6286C14360095CCD8 /* libldk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D3E7C5286C142F0095CCD8 /* libldk.a */; };
366-
07D3E7CB286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3E7C8286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift */; };
367-
07D3E7CC286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3E7C8286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift */; };
368366
07D3E7CD286C21AA0095CCD8 /* ChannelManagerConstructor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3E7C9286C21AA0095CCD8 /* ChannelManagerConstructor.swift */; };
369367
07D3E7CE286C21AA0095CCD8 /* ChannelManagerConstructor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3E7C9286C21AA0095CCD8 /* ChannelManagerConstructor.swift */; };
370368
07D3E7CF286C21AA0095CCD8 /* UtilMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3E7CA286C21AA0095CCD8 /* UtilMethods.swift */; };
@@ -742,7 +740,6 @@
742740
07D3E666286C0B700095CCD8 /* InvoicePayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InvoicePayer.swift; sourceTree = "<group>"; };
743741
07D3E667286C0B700095CCD8 /* DelayedPaymentOutputDescriptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DelayedPaymentOutputDescriptor.swift; sourceTree = "<group>"; };
744742
07D3E7C5286C142F0095CCD8 /* libldk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libldk.a; sourceTree = "<group>"; };
745-
07D3E7C8286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetGraphMsgHandlerConstructor.swift; sourceTree = "<group>"; };
746743
07D3E7C9286C21AA0095CCD8 /* ChannelManagerConstructor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChannelManagerConstructor.swift; sourceTree = "<group>"; };
747744
07D3E7CA286C21AA0095CCD8 /* UtilMethods.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilMethods.swift; sourceTree = "<group>"; };
748745
/* End PBXFileReference section */
@@ -1226,7 +1223,6 @@
12261223
07D3E7C7286C21AA0095CCD8 /* batteries */ = {
12271224
isa = PBXGroup;
12281225
children = (
1229-
07D3E7C8286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift */,
12301226
07D3E7C9286C21AA0095CCD8 /* ChannelManagerConstructor.swift */,
12311227
07D3E7CA286C21AA0095CCD8 /* UtilMethods.swift */,
12321228
);
@@ -1635,7 +1631,6 @@
16351631
07D3E6BF286C0B700095CCD8 /* Result_FundingCreatedDecodeErrorZ.swift in Sources */,
16361632
07D3E683286C0B700095CCD8 /* NetworkUpdate.swift in Sources */,
16371633
07D3E6B5286C0B700095CCD8 /* C2Tuple_usizeTransactionZ.swift in Sources */,
1638-
07D3E7CB286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift in Sources */,
16391634
07D3E7AC286C0B710095CCD8 /* FundingSigned.swift in Sources */,
16401635
07D3E6DE286C0B700095CCD8 /* Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.swift in Sources */,
16411636
07D3E6C3286C0B700095CCD8 /* Result_PingDecodeErrorZ.swift in Sources */,
@@ -1707,7 +1702,6 @@
17071702
07D3E7D0286C21AA0095CCD8 /* UtilMethods.swift in Sources */,
17081703
07344C63264277ED001CD90E /* LDKFrameworkTests.swift in Sources */,
17091704
07344C8826427F95001CD90E /* LDKExampleClass.swift in Sources */,
1710-
07D3E7CC286C21AA0095CCD8 /* NetGraphMsgHandlerConstructor.swift in Sources */,
17111705
0767D03F2698BB9800BEB4CC /* ldk_net.c in Sources */,
17121706
07D3E7CE286C21AA0095CCD8 /* ChannelManagerConstructor.swift in Sources */,
17131707
);

0 commit comments

Comments
 (0)