Skip to content

Commit 45a5e93

Browse files
TheBlueMattTheBlueMatt
committed
[TS] Update tests to 0.0.116 API
1 parent aeef350 commit 45a5e93

File tree

2 files changed

+36
-21
lines changed

2 files changed

+36
-21
lines changed

‎node-net/test/test.mts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const chan_handler = ldk.ErroringMessageHandler.constructor_new().as_ChannelMess
3232
const cust_handler = ldk.IgnoringMessageHandler.constructor_new().as_CustomMessageHandler();
3333
const onion_handler = ldk.IgnoringMessageHandler.constructor_new().as_OnionMessageHandler();
3434

35-
const a_pm = ldk.PeerManager.constructor_new(chan_handler, routing_handler, onion_handler, 0xdeadbeef, rng_seed, logger_a, cust_handler, keys_manager_a.as_NodeSigner());
35+
const a_pm = ldk.PeerManager.constructor_new(chan_handler, routing_handler, onion_handler, cust_handler, 0xdeadbeef, rng_seed, logger_a, keys_manager_a.as_NodeSigner());
3636
const a_net_handler = new node_net.NodeLDKNet(a_pm);
3737
var port = 10000;
3838
for (; port < 11000; port++) {
@@ -43,7 +43,7 @@ for (; port < 11000; port++) {
4343
} catch(_) {}
4444
}
4545

46-
const b_pm = ldk.PeerManager.constructor_new(chan_handler, routing_handler, onion_handler, 0xdeadbeef, rng_seed, logger_b, cust_handler, keys_manager_b.as_NodeSigner());
46+
const b_pm = ldk.PeerManager.constructor_new(chan_handler, routing_handler, onion_handler, cust_handler, 0xdeadbeef, rng_seed, logger_b, keys_manager_b.as_NodeSigner());
4747
const b_net_handler = new node_net.NodeLDKNet(b_pm);
4848
await b_net_handler.connect_peer("127.0.0.1", port, node_a_pk);
4949

‎ts/test/tests.mts‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ function get_chanman(): Node {
7474
var tx_broadcaster: ldk.BroadcasterInterface;
7575
const tx_broadcasted: Promise<Uint8Array> = new Promise((resolve, _reject) => {
7676
tx_broadcaster = ldk.BroadcasterInterface.new_impl({
77-
broadcast_transaction(tx: Uint8Array): void { console.log("Tx Broadcast: " + tx); resolve(tx); }
77+
broadcast_transactions(txn: Uint8Array[]): void {
78+
for (const tx of txn) {
79+
console.log("Tx Broadcast: " + tx); resolve(tx);
80+
}
81+
}
7882
} as ldk.BroadcasterInterfaceInterface);
7983
});
8084
const logger = ldk.Logger.new_impl({
@@ -101,14 +105,15 @@ function get_chanman(): Node {
101105
const keys_manager = ldk.KeysManager.constructor_new(seed, BigInt(42), 42);
102106

103107
const net_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet, logger);
104-
const scorer = ldk.ProbabilisticScorer.constructor_new(ldk.ProbabilisticScoringParameters.constructor_default(), net_graph, logger);
108+
const scorer = ldk.ProbabilisticScorer.constructor_new(ldk.ProbabilisticScoringDecayParameters.constructor_default(), net_graph, logger);
105109
const lockable_score = ldk.MultiThreadedLockableScore.constructor_new(scorer.as_Score());
106-
const router = ldk.DefaultRouter.constructor_new(net_graph, logger, keys_manager.as_EntropySource().get_secure_random_bytes(), lockable_score.as_LockableScore());
110+
const router = ldk.DefaultRouter.constructor_new(net_graph, logger, keys_manager.as_EntropySource().get_secure_random_bytes(), lockable_score.as_LockableScore(), ldk.ProbabilisticScoringFeeParameters.constructor_default());
107111

108112
const config = ldk.UserConfig.constructor_default();
109113
const params = ldk.ChainParameters.constructor_new(ldk.Network.LDKNetwork_Testnet, ldk.BestBlock.constructor_from_network(ldk.Network.LDKNetwork_Testnet));
110-
const chan_man = ldk.ChannelManager.constructor_new(fee_est, chain_watch, tx_broadcaster!, router.as_Router(), logger,
111-
keys_manager.as_EntropySource(), keys_manager.as_NodeSigner(), keys_manager.as_SignerProvider(), config, params);
114+
const chan_man = ldk.ChannelManager.constructor_new(fee_est, chain_watch, tx_broadcaster!, router.as_Router(),
115+
logger, keys_manager.as_EntropySource(), keys_manager.as_NodeSigner(), keys_manager.as_SignerProvider(),
116+
config, params, 42);
112117
return new Node(chan_man, tx_broadcasted, logger, keys_manager);
113118
}
114119

@@ -174,8 +179,8 @@ tests.push(async () => {
174179

175180
const features = a.chan_man.as_ChannelMessageHandler().provided_init_features(b.chan_man.get_our_node_id());
176181

177-
a.chan_man.as_ChannelMessageHandler().peer_connected(b.chan_man.get_our_node_id(), ldk.Init.constructor_new(features, ldk.Option_NetAddressZ.constructor_none()), false);
178-
b.chan_man.as_ChannelMessageHandler().peer_connected(a.chan_man.get_our_node_id(), ldk.Init.constructor_new(features, ldk.Option_NetAddressZ.constructor_none()), true);
182+
a.chan_man.as_ChannelMessageHandler().peer_connected(b.chan_man.get_our_node_id(), ldk.Init.constructor_new(features, ldk.Option_CVec_ChainHashZZ.constructor_none(), ldk.Option_NetAddressZ.constructor_none()), false);
183+
b.chan_man.as_ChannelMessageHandler().peer_connected(a.chan_man.get_our_node_id(), ldk.Init.constructor_new(features, ldk.Option_CVec_ChainHashZZ.constructor_none(), ldk.Option_NetAddressZ.constructor_none()), true);
179184

180185
const chan_create_err = a.chan_man.create_channel(b.chan_man.get_our_node_id(), BigInt(0), BigInt(400), BigInt(0), ldk.UserConfig.constructor_default());
181186
if (chan_create_err.is_ok()) return false;
@@ -222,10 +227,12 @@ tests.push(async () => {
222227
const b = get_chanman();
223228

224229
const ignorer = ldk.IgnoringMessageHandler.constructor_new();
225-
const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), ignorer.as_OnionMessageHandler(),
226-
0xdeadbeef, a.keys_manager.as_EntropySource().get_secure_random_bytes(), a.logger, ignorer.as_CustomMessageHandler(), a.keys_manager.as_NodeSigner());
227-
const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), ignorer.as_OnionMessageHandler(),
228-
0xdeadbeef, b.keys_manager.as_EntropySource().get_secure_random_bytes(), b.logger, ignorer.as_CustomMessageHandler(), b.keys_manager.as_NodeSigner());
230+
const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(),
231+
ignorer.as_OnionMessageHandler(), ignorer.as_CustomMessageHandler(),
232+
0xdeadbeef, a.keys_manager.as_EntropySource().get_secure_random_bytes(), a.logger, a.keys_manager.as_NodeSigner());
233+
const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(),
234+
ignorer.as_OnionMessageHandler(), ignorer.as_CustomMessageHandler(),
235+
0xdeadbeef, b.keys_manager.as_EntropySource().get_secure_random_bytes(), b.logger, b.keys_manager.as_NodeSigner());
229236

230237
var sock_b: ldk.SocketDescriptor;
231238
const sock_a = ldk.SocketDescriptor.new_impl({
@@ -321,7 +328,9 @@ tests.push(async () => {
321328
},
322329
} as ldk.CustomOnionMessageHandlerInterface);
323330

324-
const underlying_om_a = ldk.OnionMessenger.constructor_new(a.keys_manager.as_EntropySource(), a.keys_manager.as_NodeSigner(), a.logger, om_handler_a);
331+
const underlying_om_a = ldk.OnionMessenger.constructor_new(a.keys_manager.as_EntropySource(),
332+
a.keys_manager.as_NodeSigner(), a.logger, ldk.DefaultMessageRouter.constructor_new().as_MessageRouter(),
333+
ignorer.as_OffersMessageHandler(), om_handler_a);
325334
const om_provider_a = {
326335
next_onion_message_for_peer(peer_node_id: Uint8Array): ldk.OnionMessage {
327336
return underlying_om_a.as_OnionMessageProvider().next_onion_message_for_peer(peer_node_id);
@@ -361,12 +370,16 @@ tests.push(async () => {
361370
b_handled_msg = true;
362371
},
363372
} as ldk.CustomOnionMessageHandlerInterface);
364-
const om_b = ldk.OnionMessenger.constructor_new(b.keys_manager.as_EntropySource(), b.keys_manager.as_NodeSigner(), b.logger, om_handler_b);
373+
const om_b = ldk.OnionMessenger.constructor_new(b.keys_manager.as_EntropySource(), b.keys_manager.as_NodeSigner(),
374+
b.logger, ldk.DefaultMessageRouter.constructor_new().as_MessageRouter(), ignorer.as_OffersMessageHandler(),
375+
om_handler_b);
365376

366-
const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), om_a,
367-
0xdeadbeef, a.keys_manager.as_EntropySource().get_secure_random_bytes(), a.logger, ignorer.as_CustomMessageHandler(), a.keys_manager.as_NodeSigner());
368-
const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), om_b.as_OnionMessageHandler(),
369-
0xdeadbeef, b.keys_manager.as_EntropySource().get_secure_random_bytes(), b.logger, ignorer.as_CustomMessageHandler(), b.keys_manager.as_NodeSigner());
377+
const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(),
378+
om_a, ignorer.as_CustomMessageHandler(), 0xdeadbeef,
379+
a.keys_manager.as_EntropySource().get_secure_random_bytes(), a.logger, a.keys_manager.as_NodeSigner());
380+
const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(),
381+
om_b.as_OnionMessageHandler(), ignorer.as_CustomMessageHandler(), 0xdeadbeef,
382+
b.keys_manager.as_EntropySource().get_secure_random_bytes(), b.logger, b.keys_manager.as_NodeSigner());
370383

371384
var sock_b: ldk.SocketDescriptor;
372385
const sock_a = ldk.SocketDescriptor.new_impl({
@@ -418,7 +431,8 @@ tests.push(async () => {
418431
assert(pm_a.get_peer_node_ids().length == 1);
419432
assert(pm_b.get_peer_node_ids().length == 1);
420433

421-
underlying_om_a.send_onion_message([], ldk.Destination.constructor_node(b.node_id),
434+
underlying_om_a.send_onion_message(
435+
ldk.OnionMessagePath.constructor_new([], ldk.Destination.constructor_node(b.node_id)),
422436
ldk.OnionMessageContents.constructor_custom(ldk.CustomOnionMessageContents.new_impl({
423437
tlv_type(): bigint { return 4242n; },
424438
write(): Uint8Array {
@@ -430,7 +444,8 @@ tests.push(async () => {
430444
pm_a.process_events();
431445
assert(b_handled_msg);
432446

433-
om_b.send_onion_message([], ldk.Destination.constructor_node(a.node_id),
447+
om_b.send_onion_message(
448+
ldk.OnionMessagePath.constructor_new([], ldk.Destination.constructor_node(a.node_id)),
434449
ldk.OnionMessageContents.constructor_custom(ldk.CustomOnionMessageContents.new_impl({
435450
tlv_type(): bigint { return 4343n; },
436451
write(): Uint8Array {

0 commit comments

Comments
 (0)