X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Ftest%2Ftests.mts;h=d0728bb2293258abe18794a7684ac3a951f1560c;hb=refs%2Fheads%2Fmain;hp=3d82697ff8f354a046a7133cd74ba1f4ee3e4797;hpb=0800f52508a2f2665042a0c41ca5e8b525160277;p=ldk-java diff --git a/ts/test/tests.mts b/ts/test/tests.mts index 3d82697f..d0728bb2 100644 --- a/ts/test/tests.mts +++ b/ts/test/tests.mts @@ -39,9 +39,9 @@ tests.push(async () => { if (!(read_outpoint instanceof ldk.Result_OutPointDecodeErrorZ_OK)) return false; if (!read_outpoint.res.eq(outpoint)) return false; if (read_outpoint.res.hash() != outpoint.hash()) return false; - const chan_id = read_outpoint.res.to_channel_id(); - if (chan_id.length != 32) return false; - if (chan_id[31] != 4) return false; + const chan_id = ldk.ChannelId.constructor_v1_from_funding_outpoint(read_outpoint.res); + if (chan_id.get_a().length != 32) return false; + if (chan_id.get_a()[31] != 4) return false; return true; }); @@ -51,9 +51,9 @@ tests.push(async () => { if (!(read_outpoint instanceof ldk.Result_OutPointDecodeErrorZ_OK)) return false; if (!read_outpoint.res.eq(outpoint)) return false; if (read_outpoint.res.hash() != outpoint.hash()) return false; - const chan_id = read_outpoint.res.to_channel_id(); - if (chan_id.length != 32) return false; - if (chan_id[31] != 4) return false; + const chan_id = ldk.ChannelId.constructor_v1_from_funding_outpoint(read_outpoint.res); + if (chan_id.get_a().length != 32) return false; + if (chan_id.get_a()[31] != 4) return false; return true; }); @@ -61,7 +61,9 @@ var seed_counter = 0; class Node { node_id: Uint8Array; constructor(public chan_man: ldk.ChannelManager, public tx_broadcasted: Promise, - public logger: ldk.Logger, public keys_manager: ldk.KeysManager) { + public logger: ldk.Logger, public keys_manager: ldk.KeysManager, + public net_graph: ldk.NetworkGraph + ) { this.node_id = chan_man.get_our_node_id(); } } @@ -107,14 +109,14 @@ function get_chanman(): Node { const net_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet, logger); const scorer = ldk.ProbabilisticScorer.constructor_new(ldk.ProbabilisticScoringDecayParameters.constructor_default(), net_graph, logger); const lockable_score = ldk.MultiThreadedLockableScore.constructor_new(scorer.as_Score()); - 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()); + const router = ldk.DefaultRouter.constructor_new(net_graph, logger, keys_manager.as_EntropySource(), lockable_score.as_LockableScore(), ldk.ProbabilisticScoringFeeParameters.constructor_default()); const config = ldk.UserConfig.constructor_default(); const params = ldk.ChainParameters.constructor_new(ldk.Network.LDKNetwork_Testnet, ldk.BestBlock.constructor_from_network(ldk.Network.LDKNetwork_Testnet)); const chan_man = ldk.ChannelManager.constructor_new(fee_est, chain_watch, tx_broadcaster!, router.as_Router(), logger, keys_manager.as_EntropySource(), keys_manager.as_NodeSigner(), keys_manager.as_SignerProvider(), config, params, 42); - return new Node(chan_man, tx_broadcasted, logger, keys_manager); + return new Node(chan_man, tx_broadcasted, logger, keys_manager, net_graph); } function exchange_messages(a: ldk.ChannelManager, b: ldk.ChannelManager) { @@ -182,13 +184,13 @@ tests.push(async () => { a.chan_man.as_ChannelMessageHandler().peer_connected(b.chan_man.get_our_node_id(), ldk.Init.constructor_new(features, ldk.Option_CVec_ThirtyTwoBytesZZ.constructor_none(), ldk.Option_SocketAddressZ.constructor_none()), false); b.chan_man.as_ChannelMessageHandler().peer_connected(a.chan_man.get_our_node_id(), ldk.Init.constructor_new(features, ldk.Option_CVec_ThirtyTwoBytesZZ.constructor_none(), ldk.Option_SocketAddressZ.constructor_none()), true); - 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()); + const chan_create_err = a.chan_man.create_channel(b.chan_man.get_our_node_id(), BigInt(0), BigInt(400), BigInt(0), null, null); if (chan_create_err.is_ok()) return false; - if (!(chan_create_err instanceof ldk.Result_ThirtyTwoBytesAPIErrorZ_Err)) return false; + if (!(chan_create_err instanceof ldk.Result_ChannelIdAPIErrorZ_Err)) return false; if (!(chan_create_err.err instanceof ldk.APIError_APIMisuseError)) return false; if (chan_create_err.err.err != "Channel value must be at least 1000 satoshis. It was 0") return false; - const chan_create_res = a.chan_man.create_channel(b.chan_man.get_our_node_id(), BigInt(1000000), BigInt(400), BigInt(0), ldk.UserConfig.constructor_default()); + const chan_create_res = a.chan_man.create_channel(b.chan_man.get_our_node_id(), BigInt(1000000), BigInt(400), BigInt(0), null, null); if (!chan_create_res.is_ok()) return false; if (!exchange_messages(a.chan_man, b.chan_man)) return false; @@ -281,17 +283,17 @@ tests.push(async () => { if (!(init_bytes instanceof ldk.Result_CVec_u8ZPeerHandleErrorZ_OK)) return false; assert(pm_b.read_event(sock_b, init_bytes.res) instanceof ldk.Result_boolPeerHandleErrorZ_OK); - assert(pm_a.get_peer_node_ids().length == 0); - assert(pm_b.get_peer_node_ids().length == 0); + assert(pm_a.list_peers().length == 0); + assert(pm_b.list_peers().length == 0); pm_b.process_events(); pm_a.process_events(); pm_b.process_events(); - assert(pm_a.get_peer_node_ids().length == 1); - assert(pm_b.get_peer_node_ids().length == 1); + assert(pm_a.list_peers().length == 1); + assert(pm_b.list_peers().length == 1); - const chan_create_res = a.chan_man.create_channel(b.node_id, BigInt(1000000), BigInt(400), BigInt(0), ldk.UserConfig.constructor_default()); + const chan_create_res = a.chan_man.create_channel(b.node_id, BigInt(1000000), BigInt(400), BigInt(0), null, ldk.UserConfig.constructor_default()); if (!chan_create_res.is_ok()) return false; if (!update_done) return false; @@ -313,29 +315,31 @@ tests.push(async () => { var a_handled_msg = false; const om_handler_a = ldk.CustomOnionMessageHandler.new_impl({ - read_custom_message(message_type: bigint, buffer: Uint8Array): ldk.Result_COption_CustomOnionMessageContentsZDecodeErrorZ { + read_custom_message(message_type: bigint, buffer: Uint8Array): ldk.Result_COption_OnionMessageContentsZDecodeErrorZ { assert(message_type == 4343n); assert(buffer.length == 44); for (var i = 0; i < 44; i++) assert(buffer[i] == 67); - return ldk.Result_COption_CustomOnionMessageContentsZDecodeErrorZ.constructor_ok(ldk.Option_CustomOnionMessageContentsZ.constructor_some(ldk.CustomOnionMessageContents.new_impl({ + return ldk.Result_COption_OnionMessageContentsZDecodeErrorZ.constructor_ok(ldk.Option_OnionMessageContentsZ.constructor_some(ldk.OnionMessageContents.new_impl({ tlv_type(): bigint { return 9998n; }, - write(): Uint8Array { throw new Error(); } - } as ldk.CustomOnionMessageContentsInterface))); + write(): Uint8Array { throw new Error(); }, + debug_str(): string { return "Message Contents"; } + } as ldk.OnionMessageContentsInterface))); }, - handle_custom_message(msg: ldk.CustomOnionMessageContents) { + handle_custom_message(msg: ldk.OnionMessageContents): ldk.Option_OnionMessageContentsZ { assert(msg.tlv_type() == 9998n); a_handled_msg = true; + return ldk.Option_OnionMessageContentsZ.constructor_none(); + }, + release_pending_custom_messages(): ldk.ThreeTuple_OnionMessageContentsDestinationBlindedPathZ[] { + return []; }, } as ldk.CustomOnionMessageHandlerInterface); - const underlying_om_a = ldk.OnionMessenger.constructor_new(a.keys_manager.as_EntropySource(), - a.keys_manager.as_NodeSigner(), a.logger, ldk.DefaultMessageRouter.constructor_new().as_MessageRouter(), - ignorer.as_OffersMessageHandler(), om_handler_a); - const om_provider_a = { - next_onion_message_for_peer(peer_node_id: Uint8Array): ldk.OnionMessage { - return underlying_om_a.as_OnionMessageProvider().next_onion_message_for_peer(peer_node_id); - } - } as ldk.OnionMessageProviderInterface; + const a_msg_router = ldk.DefaultMessageRouter + .constructor_new(a.net_graph, a.keys_manager.as_EntropySource()).as_MessageRouter(); + const underlying_om_a = ldk.OnionMessenger.constructor_new( + a.keys_manager.as_EntropySource(), a.keys_manager.as_NodeSigner(), a.logger, + a.chan_man.as_NodeIdLookUp(), a_msg_router, ignorer.as_OffersMessageHandler(), om_handler_a); const om_a = ldk.OnionMessageHandler.new_impl({ handle_onion_message(peer_node_id: Uint8Array, msg: ldk.OnionMessage) { underlying_om_a.as_OnionMessageHandler().handle_onion_message(peer_node_id, msg); @@ -351,28 +355,37 @@ tests.push(async () => { }, provided_init_features(their_node_id: Uint8Array): ldk.InitFeatures { return underlying_om_a.as_OnionMessageHandler().provided_init_features(their_node_id); - } - } as ldk.OnionMessageHandlerInterface, om_provider_a); + }, + next_onion_message_for_peer(peer_node_id: Uint8Array): ldk.OnionMessage { + return underlying_om_a.as_OnionMessageHandler().next_onion_message_for_peer(peer_node_id); + }, + } as ldk.OnionMessageHandlerInterface); var b_handled_msg = false; const om_handler_b = ldk.CustomOnionMessageHandler.new_impl({ - read_custom_message(message_type: bigint, buffer: Uint8Array): ldk.Result_COption_CustomOnionMessageContentsZDecodeErrorZ { + read_custom_message(message_type: bigint, buffer: Uint8Array): ldk.Result_COption_OnionMessageContentsZDecodeErrorZ { assert(message_type == 4242n); assert(buffer.length == 43); for (var i = 0; i < 43; i++) assert(buffer[i] == 66); - return ldk.Result_COption_CustomOnionMessageContentsZDecodeErrorZ.constructor_ok(ldk.Option_CustomOnionMessageContentsZ.constructor_some(ldk.CustomOnionMessageContents.new_impl({ + return ldk.Result_COption_OnionMessageContentsZDecodeErrorZ.constructor_ok(ldk.Option_OnionMessageContentsZ.constructor_some(ldk.OnionMessageContents.new_impl({ tlv_type(): bigint { return 9999n; }, - write(): Uint8Array { throw new Error(); } - } as ldk.CustomOnionMessageContentsInterface))); + write(): Uint8Array { throw new Error(); }, + debug_str(): string { return "Message Contents"; } + } as ldk.OnionMessageContentsInterface))); }, - handle_custom_message(msg: ldk.CustomOnionMessageContents) { + handle_custom_message(msg: ldk.OnionMessageContents): ldk.Option_OnionMessageContentsZ { assert(msg.tlv_type() == 9999n); b_handled_msg = true; + return ldk.Option_OnionMessageContentsZ.constructor_none(); }, + release_pending_custom_messages(): ldk.ThreeTuple_OnionMessageContentsDestinationBlindedPathZ[] { + return []; + } } as ldk.CustomOnionMessageHandlerInterface); + const msg_router_b = ldk.DefaultMessageRouter + .constructor_new(b.net_graph, b.keys_manager.as_EntropySource()).as_MessageRouter(); const om_b = ldk.OnionMessenger.constructor_new(b.keys_manager.as_EntropySource(), b.keys_manager.as_NodeSigner(), - b.logger, ldk.DefaultMessageRouter.constructor_new().as_MessageRouter(), ignorer.as_OffersMessageHandler(), - om_handler_b); + b.logger, b.chan_man.as_NodeIdLookUp(), msg_router_b, ignorer.as_OffersMessageHandler(), om_handler_b); const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), om_a, ignorer.as_CustomMessageHandler(), 0xdeadbeef, @@ -421,39 +434,39 @@ tests.push(async () => { if (!(init_bytes instanceof ldk.Result_CVec_u8ZPeerHandleErrorZ_OK)) return false; assert(pm_b.read_event(sock_b, init_bytes.res) instanceof ldk.Result_boolPeerHandleErrorZ_OK); - assert(pm_a.get_peer_node_ids().length == 0); - assert(pm_b.get_peer_node_ids().length == 0); + assert(pm_a.list_peers().length == 0); + assert(pm_b.list_peers().length == 0); pm_b.process_events(); pm_a.process_events(); pm_b.process_events(); - assert(pm_a.get_peer_node_ids().length == 1); - assert(pm_b.get_peer_node_ids().length == 1); + assert(pm_a.list_peers().length == 1); + assert(pm_b.list_peers().length == 1); underlying_om_a.send_onion_message( - ldk.OnionMessagePath.constructor_new([], ldk.Destination.constructor_node(b.node_id)), - ldk.OnionMessageContents.constructor_custom(ldk.CustomOnionMessageContents.new_impl({ + ldk.OnionMessageContents.new_impl({ tlv_type(): bigint { return 4242n; }, write(): Uint8Array { const ret = new Uint8Array(43); for (var i = 0; i < 43; i++) ret[i] = 66; return ret; - } - } as ldk.CustomOnionMessageContentsInterface)), null); + }, + debug_str(): string { return "Onion Message A Contents"; } + } as ldk.OnionMessageContentsInterface), ldk.Destination.constructor_node(b.node_id), null); pm_a.process_events(); assert(b_handled_msg); om_b.send_onion_message( - ldk.OnionMessagePath.constructor_new([], ldk.Destination.constructor_node(a.node_id)), - ldk.OnionMessageContents.constructor_custom(ldk.CustomOnionMessageContents.new_impl({ + ldk.OnionMessageContents.new_impl({ tlv_type(): bigint { return 4343n; }, write(): Uint8Array { const ret = new Uint8Array(44); for (var i = 0; i < 44; i++) ret[i] = 67; return ret; - } - } as ldk.CustomOnionMessageContentsInterface)), null); + }, + debug_str(): string { return "Onion Message A Contents"; } + } as ldk.OnionMessageContentsInterface), ldk.Destination.constructor_node(a.node_id), null); pm_b.process_events(); assert(a_handled_msg);