Skip to content

Commit e5e0881

Browse files
arik-soarik-so
committed
Update manual bindings.
1 parent 76cdb0a commit e5e0881

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
225225

226226
self.channel_monitors = []
227227
self.channel_manager_latest_block_hash = nil
228-
let block = BestBlock(blockHash: currentBlockchainTipHash, height: currentBlockchainTipHeight)
228+
let block = BestBlock(blockHashArg: currentBlockchainTipHash, heightArg: currentBlockchainTipHeight)
229229
let chainParameters = ChainParameters(networkArg: network, bestBlockArg: block)
230230

231231
self.netGraph = netGraph

‎ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ public class HumanObjectPeerTestInstance {
252252
}
253253

254254
fileprivate class TestPersister: Persist {
255-
override func persistNewChannel(channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
255+
override func persistNewChannel(channelFundingOutpoint channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
256256
.Completed
257257
}
258-
override func updatePersistedChannel(channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
258+
override func updatePersistedChannel(channelFundingOutpoint channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
259259
.Completed
260260
}
261261
}
@@ -475,9 +475,9 @@ public class HumanObjectPeerTestInstance {
475475
let peerB = Peer(master: self, seed: 2)
476476
let peerC = Peer(master: self, seed: 3)
477477

478-
let originalPeersA = peerA.peerManager.getPeerNodeIds()
479-
let originalPeersB = peerB.peerManager.getPeerNodeIds()
480-
let originalPeersC = peerC.peerManager.getPeerNodeIds()
478+
let originalPeersA = peerA.peerManager.listPeers()
479+
let originalPeersB = peerB.peerManager.listPeers()
480+
let originalPeersC = peerC.peerManager.listPeers()
481481
XCTAssertEqual(originalPeersA.count, 0)
482482
XCTAssertEqual(originalPeersB.count, 0)
483483
XCTAssertEqual(originalPeersC.count, 0)
@@ -487,8 +487,8 @@ public class HumanObjectPeerTestInstance {
487487

488488
// sleep for one second
489489
try! await Task.sleep(nanoseconds: 1_000_000_000)
490-
let connectedPeersA = peerA.peerManager.getPeerNodeIds()
491-
let connectedPeersB = peerB.peerManager.getPeerNodeIds()
490+
let connectedPeersA = peerA.peerManager.listPeers()
491+
let connectedPeersB = peerB.peerManager.listPeers()
492492
XCTAssertEqual(connectedPeersA.count, 1)
493493
XCTAssertEqual(connectedPeersB.count, 1)
494494
}
@@ -498,8 +498,8 @@ public class HumanObjectPeerTestInstance {
498498

499499
// sleep for one second
500500
try! await Task.sleep(nanoseconds: 1_000_000_000)
501-
let connectedPeersA = peerA.peerManager.getPeerNodeIds()
502-
let connectedPeersC = peerC.peerManager.getPeerNodeIds()
501+
let connectedPeersA = peerA.peerManager.listPeers()
502+
let connectedPeersC = peerC.peerManager.listPeers()
503503
XCTAssertEqual(connectedPeersA.count, 2)
504504
XCTAssertEqual(connectedPeersC.count, 1)
505505
}
@@ -523,7 +523,7 @@ public class HumanObjectPeerTestInstance {
523523
let config = UserConfig.initWithDefault()
524524
let theirNodeId = peerB.channelManager.getOurNodeId()
525525
let userChannelId: [UInt8] = [UInt8](repeating: 42, count: 16);
526-
let channelOpenResult = peerA.channelManager.createChannel(theirNetworkKey: theirNodeId, channelValueSatoshis: fundingAmount, pushMsat: 1000, userChannelId: userChannelId, temporaryChannelId: nil, overrideConfig: config)
526+
let channelOpenResult = peerA.channelManager.createChannel(theirNetworkKey: theirNodeId, channelValueSatoshis: fundingAmount, pushMsat: 1000, userChannelId: userChannelId, temporaryChannelId: ChannelId.initWithZero(), overrideConfig: config)
527527

528528
XCTAssertTrue(channelOpenResult.isOk())
529529
let channels = peerA.channelManager.listChannels()
@@ -647,9 +647,9 @@ public class HumanObjectPeerTestInstance {
647647
XCTAssertEqual(channelAToB.getChannelValueSatoshis(), fundingAmount)
648648
let shortChannelId = channelAToB.getShortChannelId()!
649649

650-
let fundingTxId = fundingTransaction.calculateId()
651-
XCTAssertEqual(usableChannelsA[0].getChannelId(), fundingTxId)
652-
XCTAssertEqual(usableChannelsB[0].getChannelId(), fundingTxId)
650+
let fundingChannelId = ChannelId.initWithV1FromFundingTxid(txid: fundingTransaction.calculateId(), outputIndex: 0)
651+
XCTAssertEqual(usableChannelsA[0].getChannelId().write(), fundingChannelId.write())
652+
XCTAssertEqual(usableChannelsB[0].getChannelId().write(), fundingChannelId.write())
653653

654654
let originalChannelBalanceAToB = channelAToB.getBalanceMsat()
655655
let originalChannelBalanceBToA = channelBToA.getBalanceMsat()
@@ -673,8 +673,8 @@ public class HumanObjectPeerTestInstance {
673673

674674
do {
675675
// connect the nodes
676-
let originalPeersA = peer1.peerManager.getPeerNodeIds()
677-
let originalPeersB = peer2.peerManager.getPeerNodeIds()
676+
let originalPeersA = peer1.peerManager.listPeers()
677+
let originalPeersB = peer2.peerManager.listPeers()
678678
XCTAssertEqual(originalPeersA.count, 0)
679679
XCTAssertEqual(originalPeersB.count, 0)
680680

@@ -684,9 +684,9 @@ public class HumanObjectPeerTestInstance {
684684
// sleep for one second
685685
try! await Task.sleep(nanoseconds: 1_000_000_000)
686686

687-
let connectedPeersA = peer1.peerManager.getPeerNodeIds()
688-
let connectedPeersB = peer2.peerManager.getPeerNodeIds()
689-
let connectedPeersC = peer3.peerManager.getPeerNodeIds()
687+
let connectedPeersA = peer1.peerManager.listPeers()
688+
let connectedPeersB = peer2.peerManager.listPeers()
689+
let connectedPeersC = peer3.peerManager.listPeers()
690690
XCTAssertEqual(connectedPeersA.count, 1)
691691
XCTAssertEqual(connectedPeersB.count, 2)
692692
XCTAssertEqual(connectedPeersC.count, 1)
@@ -788,10 +788,10 @@ public class HumanObjectPeerTestInstance {
788788
let paymentHash = paymentClaimable.getPaymentHash()
789789
print("received payment of \(paymentClaimable.getAmountMsat()) with hash \(paymentHash)")
790790
let paymentPurpose = paymentClaimable.getPurpose()
791-
guard case .InvoicePayment = paymentPurpose.getValueType() else {
791+
guard case .Bolt11InvoicePayment = paymentPurpose.getValueType() else {
792792
return XCTAssert(false, "Expected .InvoicePayment, got \(paymentPurpose.getValueType())")
793793
}
794-
let invoicePayment = paymentPurpose.getValueAsInvoicePayment()!
794+
let invoicePayment = paymentPurpose.getValueAsBolt11InvoicePayment()!
795795
let preimage = invoicePayment.getPaymentPreimage()!
796796
let secret = invoicePayment.getPaymentSecret()
797797
if self.configuration.shouldRecipientRejectPayment {
@@ -913,10 +913,10 @@ public class HumanObjectPeerTestInstance {
913913
let paymentHash = paymentClaimable.getPaymentHash()
914914
print("received payment of \(paymentClaimable.getAmountMsat()) with hash \(paymentHash)")
915915
let paymentPurpose = paymentClaimable.getPurpose()
916-
guard case .InvoicePayment = paymentPurpose.getValueType() else {
916+
guard case .Bolt11InvoicePayment = paymentPurpose.getValueType() else {
917917
return XCTAssert(false, "Expected .InvoicePayment, got \(paymentPurpose.getValueType())")
918918
}
919-
let invoicePayment = paymentPurpose.getValueAsInvoicePayment()!
919+
let invoicePayment = paymentPurpose.getValueAsBolt11InvoicePayment()!
920920
let preimage = invoicePayment.getPaymentPreimage()!
921921
let secret = invoicePayment.getPaymentSecret()
922922
peer1.channelManager.claimFunds(paymentPreimage: preimage)

‎ci/LDKSwift/Tests/LDKSwiftTests/LDKSwiftTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ class LDKSwiftTests: XCTestCase {
241241
let reserveAmount: UInt64 = 1000 // a thousand satoshis rserve
242242
let peerPubkey = Self.hexStringToBytes(hexString: "02deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef")!
243243
let userChannelId: [UInt8] = [UInt8](repeating: 42, count: 16);
244-
let channelOpenResult = channelManager.createChannel(theirNetworkKey: peerPubkey, channelValueSatoshis: channelValue, pushMsat: reserveAmount, userChannelId: userChannelId, temporaryChannelId: nil, overrideConfig: config)
244+
let channelOpenResult = channelManager.createChannel(theirNetworkKey: peerPubkey, channelValueSatoshis: channelValue, pushMsat: reserveAmount, userChannelId: userChannelId, temporaryChannelId: ChannelId.initWithZero(), overrideConfig: config)
245245

246246
let channelOpenError = channelOpenResult.getError()!
247247
print("error type: \(channelOpenError.getValueType())")

‎ci/LDKSwift/Tests/LDKSwiftTests/TestPersister.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import LDKHeaders
1212

1313
class TestPersister: Persist {
1414

15-
override func persistNewChannel(channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
15+
override func persistNewChannel(channelFundingOutpoint channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
1616
.Completed
1717
}
1818

19-
override func updatePersistedChannel(channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
19+
override func updatePersistedChannel(channelFundingOutpoint channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
2020
.Completed
2121
}
2222

‎xcode/LDKFramework/DirectlyLinkedBindingsApp/app-batteries/PolarIntegrationSample.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ public class PolarIntegrationSample {
126126

127127
// sleep for one second
128128
try await Task.sleep(nanoseconds: 1_000_000_000)
129-
let connectedPeers = peerManager.getPeerNodeIds()
129+
let connectedPeers = peerManager.listPeers()
130130

131131
let channelValue: UInt64 = 1_300_000 // 1.3 million satoshis, or 0.013 BTC
132132
let channelValueBtcString = "0.013"
133133
let reserveAmount: UInt64 = 1000 // a thousand satoshis rserve
134134
let userChannelId: [UInt8] = [UInt8](repeating: 42, count: 16);
135-
let channelOpenResult = channelManager.createChannel(theirNetworkKey: lndPubkey, channelValueSatoshis: channelValue, pushMsat: reserveAmount, userChannelId: userChannelId, temporaryChannelId: nil, overrideConfig: config)
135+
let channelOpenResult = channelManager.createChannel(theirNetworkKey: lndPubkey, channelValueSatoshis: channelValue, pushMsat: reserveAmount, userChannelId: userChannelId, temporaryChannelId: ChannelId.initWithZero(), overrideConfig: config)
136136

137137
if let channelOpenError = channelOpenResult.getError() {
138138
print("error type: \(channelOpenError.getValueType())")
@@ -227,7 +227,7 @@ public class PolarIntegrationSample {
227227
try await Task.sleep(nanoseconds: 0_100_000_000)
228228
}
229229

230-
print(channelManagerConstructor.peerManager.getPeerNodeIds())
230+
print(channelManagerConstructor.peerManager.listPeers())
231231

232232
}
233233

@@ -324,11 +324,11 @@ public class PolarIntegrationSample {
324324

325325
class PolarChannelMonitorPersister: Persist {
326326

327-
override func persistNewChannel(channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
327+
override func persistNewChannel(channelFundingOutpoint channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
328328
return .Completed
329329
}
330330

331-
override func updatePersistedChannel(channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
331+
override func updatePersistedChannel(channelFundingOutpoint channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
332332
return .Completed
333333
}
334334

‎xcode/LDKFramework/DirectlyLinkedBindingsApp/app-batteries/RegtestChannelManagerPersister.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class RegtestChannelManagerPersister : Persister, ExtendedChannelManagerPersiste
3030
let fastFeerate = 7500
3131
let destinationScriptHardcoded: [UInt8] = [118,169,20,25,18,157,83,230,49,155,175,25,219,160,89,190,173,22,109,249,10,184,245,136,172]
3232

33-
guard let result = self.keysManager?.spendSpendableOutputs(descriptors: outputs, outputs: [], changeDestinationScript: destinationScriptHardcoded, feerateSatPer1000Weight: UInt32(fastFeerate), locktime: nil) else {
33+
guard let result = self.keysManager?.asOutputSpender().spendSpendableOutputs(descriptors: outputs, outputs: [], changeDestinationScript: destinationScriptHardcoded, feerateSatPer1000Weight: UInt32(fastFeerate), locktime: nil) else {
3434
return
3535
}
36-
36+
3737
if let transaction = result.getValue() {
3838
// sendEvent(eventName: MARKER_BROADCAST, eventBody: ["txhex": bytesToHex(bytes: transaction)])
3939
}

0 commit comments

Comments
 (0)