Skip to content

Commit 70bcbf2

Browse files
committed
Fix types for latest 117 change.
1 parent a139e9f commit 70bcbf2

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

ci/LDKSwift/Tests/LDKSwiftTests/LDKSwiftTests.swift

+8-5
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,8 @@ class LDKSwiftTests: XCTestCase {
343343
shortChannelIdArg: short_channel_id_arg,
344344
channelFeaturesArg: ChannelFeatures.initWithEmpty(),
345345
feeMsatArg: paymentValueMsat,
346-
cltvExpiryDeltaArg: finalCltvValue
346+
cltvExpiryDeltaArg: finalCltvValue,
347+
maybeAnnouncedChannelArg: false
347348
)
348349

349350
var hops: [RouteHop] = [routeHop]
@@ -356,16 +357,18 @@ class LDKSwiftTests: XCTestCase {
356357
shortChannelIdArg: short_channel_id_arg,
357358
channelFeaturesArg: ChannelFeatures.initWithEmpty(),
358359
feeMsatArg: paymentValueMsat,
359-
cltvExpiryDeltaArg: finalCltvValue
360+
cltvExpiryDeltaArg: finalCltvValue,
361+
maybeAnnouncedChannelArg: false
360362
)
361363
hops.append(extraHop)
362364
}
363365

364366
let pubkeyBytes = Self.hexStringToBytes(hexString: destPubkeyHex)!
365367
let paymentParams = PaymentParameters.initForKeysend(payeePubkey: pubkeyBytes, finalCltvExpiryDelta: 3, allowMpp: false)
368+
let routeParams = RouteParameters.init(paymentParamsArg: paymentParams, finalValueMsatArg: 1_000_000, maxTotalRoutingFeeMsatArg: nil)
366369
let blindedTail = BlindedTail(hopsArg: [], blindingPointArg: pubkeyBytes, excessFinalCltvExpiryDeltaArg: 0, finalValueMsatArg: 0)
367370
let path = Path(hopsArg: hops, blindedTailArg: blindedTail)
368-
let route = Route(pathsArg: [path], paymentParamsArg: paymentParams)
371+
let route = Route(pathsArg: [path], routeParamsArg: routeParams)
369372
}
370373

371374
#if !SWIFT_PACKAGE
@@ -425,15 +428,15 @@ class LDKSwiftTests: XCTestCase {
425428
let recipientPubkey = LDKSwiftTests.hexStringToBytes(hexString: "03864ef025fde8fb587d989186ce6a4a186895ee44a926bfc370e2c366597a3f8f")!
426429

427430
let paymentParameters = PaymentParameters.initForKeysend(payeePubkey: recipientPubkey, finalCltvExpiryDelta: 3, allowMpp: false)
428-
let routeParameters = RouteParameters(paymentParamsArg: paymentParameters, finalValueMsatArg: 500)
431+
let routeParameters = RouteParameters(paymentParamsArg: paymentParameters, finalValueMsatArg: 500, maxTotalRoutingFeeMsatArg: nil)
429432

430433
print("STEP A")
431434

432435
let firstHops: [ChannelDetails]? = nil
433436
print("STEP B")
434437
let randomSeedBytes: [UInt8] = [UInt8](repeating: 0, count: 32)
435438
let scoreParams = ProbabilisticScoringFeeParameters.initWithDefault();
436-
let foundRoute = Bindings.findRoute(ourNodePubkey: payerPubkey, routeParams: routeParameters, networkGraph: networkGraph, firstHops: [], logger: logger, scorer: score, scoreParams: scoreParams, randomSeedBytes: randomSeedBytes)
439+
let foundRoute = Bindings.findRoute(ourNodePubkey: payerPubkey, routeParams: routeParameters, networkGraph: networkGraph, firstHops: [], logger: logger, scorer: score.getScoreLookUp(), scoreParams: scoreParams, randomSeedBytes: randomSeedBytes)
437440
// let foundRoute = router.find_route(payer: payerPubkey, route_params: routeParameters, payment_hash: nil, first_hops: firstHops, inflight_htlcs: <#T##InFlightHtlcs#>)
438441

439442
if let routeError = foundRoute.getError() {

ci/LDKSwift/Tests/LDKSwiftTests/TestChannelManagerPersister.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ class TestChannelManagerPersister : Persister, ExtendedChannelManagerPersister {
2323
// privateHandleEvent(event: event)
2424
}
2525

26-
override func persistManager(channelManager: Bindings.ChannelManager) -> Bindings.Result_NoneErrorZ {
26+
override func persistScorer(scorer: Bindings.WriteableScore) -> Bindings.Result_NoneIOErrorZ {
2727
.initWithOk()
2828
}
2929

30-
override func persistScorer(scorer: Bindings.WriteableScore) -> Bindings.Result_NoneErrorZ {
30+
override func persistGraph(networkGraph: Bindings.NetworkGraph) -> Bindings.Result_NoneIOErrorZ {
3131
.initWithOk()
3232
}
3333

34-
override func persistGraph(networkGraph: Bindings.NetworkGraph) -> Bindings.Result_NoneErrorZ {
34+
override func persistManager(channelManager: Bindings.ChannelManager) -> Bindings.Result_NoneIOErrorZ {
3535
.initWithOk()
3636
}
3737
}

ci/LDKSwift/Tests/LDKSwiftTests/WrappedSignerProviderTests.swift

+4-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ class WrappedSignerProviderTests: XCTestCase {
8484

8585
class MyNodeSigner: NodeSigner {
8686
weak var myKeysManager: MyKeysManager?
87-
override func ecdh(recipient: Bindings.Recipient, otherKey: [UInt8], tweak: [UInt8]?) -> Bindings.Result_SharedSecretNoneZ {
87+
88+
override func ecdh(recipient: Bindings.Recipient, otherKey: [UInt8], tweak: [UInt8]?) -> Bindings.Result_ThirtyTwoBytesNoneZ {
8889
print("entering wrapper: ecdh()")
8990
return myKeysManager!.keysManager.asNodeSigner().ecdh(recipient: recipient, otherKey: otherKey, tweak: tweak)
9091
}
@@ -100,7 +101,7 @@ class WrappedSignerProviderTests: XCTestCase {
100101
return myKeysManager!.keysManager.asNodeSigner().getInboundPaymentKeyMaterial()
101102
}
102103

103-
override func signGossipMessage(msg: Bindings.UnsignedGossipMessage) -> Bindings.Result_SignatureNoneZ {
104+
override func signGossipMessage(msg: Bindings.UnsignedGossipMessage) -> Bindings.Result_ECDSASignatureNoneZ {
104105
print("entering wrapper: signGossipMessage()")
105106
return myKeysManager!.keysManager.asNodeSigner().signGossipMessage(msg: msg)
106107
}
@@ -136,7 +137,7 @@ class WrappedSignerProviderTests: XCTestCase {
136137
return myKeysManager!.keysManager.asSignerProvider().readChanSigner(reader: reader)
137138
}
138139

139-
override func getDestinationScript() -> Bindings.Result_ScriptNoneZ {
140+
override func getDestinationScript() -> Bindings.Result_CVec_u8ZNoneZ {
140141
print("entering wrapper: getDestinationScript()")
141142
return myKeysManager!.keysManager.asSignerProvider().getDestinationScript()
142143
}

0 commit comments

Comments
 (0)