Skip to content

Commit 4264d98

Browse files
committed
Improve route construction testing in RGS test.
1 parent 1939f70 commit 4264d98

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

ci/LDKSwift/Tests/LDKSwiftTests/LDKSwiftTests.swift

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -308,19 +308,21 @@ class LDKSwiftTests: XCTestCase {
308308
let elapsedB = Double(finishB.uptimeNanoseconds-startB.uptimeNanoseconds)/1_000_000_000
309309
print("Applied rapid sync data: \(timestamp.getValue())! Time: \(elapsedB)s")
310310

311+
/*
311312
print("Measuring graph size…")
312313
let startC = DispatchTime.now()
313314
let graphBytes = networkGraph.write()
314315
let finishC = DispatchTime.now()
315316
let elapsedC = Double(finishC.uptimeNanoseconds-startC.uptimeNanoseconds)/1_000_000_000
316317
print("Network graph size: \(graphBytes.count)! Time: \(elapsedC)s")
318+
*/
317319

318-
// let scoringParams = ProbabilisticScoringParameters()
319-
// let scorer = ProbabilisticScorer(params: scoringParams, network_graph: networkGraph, logger: logger)
320-
// let score = scorer.as_Score()
321-
let lockableScore = LockableScore()
322-
let defaultRouter = DefaultRouter(network_graph: networkGraph, logger: logger, random_seed_bytes: [UInt8](repeating: 0, count: 32), scorer: lockableScore)
323-
let router = defaultRouter.as_Router()
320+
let scoringParams = ProbabilisticScoringParameters()
321+
let scorer = ProbabilisticScorer(params: scoringParams, network_graph: networkGraph, logger: logger)
322+
let score = scorer.as_Score()
323+
// let lockableScore = LockableScore()
324+
// let defaultRouter = DefaultRouter(network_graph: networkGraph, logger: logger, random_seed_bytes: [UInt8](repeating: 0, count: 32), scorer: lockableScore)
325+
// let router = defaultRouter.as_Router()
324326

325327
// let multiThreadedScorer = MultiThreadedLockableScore(score: score)
326328

@@ -336,8 +338,24 @@ class LDKSwiftTests: XCTestCase {
336338

337339
let firstHops: [ChannelDetails]? = nil
338340
print("STEP B")
341+
let randomSeedBytes: [UInt8] = [UInt8](repeating: 0, count: 32)
342+
let foundRoute = Bindings.swift_find_route(our_node_pubkey: payerPubkey, route_params: routeParameters, network_graph: networkGraph, first_hops: nil, logger: logger, scorer: score, random_seed_bytes: randomSeedBytes)
339343
// let foundRoute = router.find_route(payer: payerPubkey, route_params: routeParameters, payment_hash: nil, first_hops: firstHops, inflight_htlcs: <#T##InFlightHtlcs#>)
340-
// print("found route: \(foundRoute)")
344+
345+
if let routeError = foundRoute.getError() {
346+
print("routing error: \(routeError.get_err())")
347+
}
348+
349+
if let route = foundRoute.getValue() {
350+
let paths = route.get_paths()
351+
print("found route with \(paths.count) paths!")
352+
for currentPath in paths {
353+
print("\n\nPath Option:")
354+
for currentHop in currentPath {
355+
print("scid: \(currentHop.get_short_channel_id()), pubkey: \(currentHop.get_pubkey()), fee (msat): \(currentHop.get_fee_msat()), CLTV delta: \(currentHop.get_cltv_expiry_delta())")
356+
}
357+
}
358+
}
341359

342360
}
343361

xcode/LDKFramework/LDK.xcodeproj/project.pbxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2809,6 +2809,7 @@
28092809
};
28102810
07E06E52287CB2AB00CFA8BF /* Run Script: Copy Headers & Build Binary */ = {
28112811
isa = PBXShellScriptBuildPhase;
2812+
alwaysOutOfDate = 1;
28122813
buildActionMask = 2147483647;
28132814
files = (
28142815
);

0 commit comments

Comments
 (0)