X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Ftest%2Ftests.mts;h=158d36365190a3e27027af4c58ed14d370f6415d;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=0528e51b1e91758b2e1e66f4ed8f046931534057;hpb=3e33cfde4213dafe90eb976eb67224e2451da855;p=ldk-java diff --git a/ts/test/tests.mts b/ts/test/tests.mts index 0528e51b..158d3636 100644 --- a/ts/test/tests.mts +++ b/ts/test/tests.mts @@ -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) { @@ -179,16 +181,16 @@ tests.push(async () => { const features = a.chan_man.as_ChannelMessageHandler().provided_init_features(b.chan_man.get_our_node_id()); - 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); - 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); + 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), ldk.Option_ThirtyTwoBytesZ.constructor_none(), null); if (chan_create_err.is_ok()) return false; - if (!(chan_create_err instanceof ldk.Result__u832APIErrorZ_Err)) return false; + if (!(chan_create_err instanceof ldk.Result_ThirtyTwoBytesAPIErrorZ_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), ldk.Option_ThirtyTwoBytesZ.constructor_none(), null); if (!chan_create_res.is_ok()) return false; if (!exchange_messages(a.chan_man, b.chan_man)) return false; @@ -268,16 +270,16 @@ tests.push(async () => { } } as ldk.SocketDescriptorInterface); - const update_fut = a.chan_man.get_persistable_update_future(); + const update_fut = a.chan_man.get_event_or_persistence_needed_future(); var update_done = false; update_fut.register_callback_fn(ldk.FutureCallback.new_impl({ call(): void { update_done = true; } })); if (update_done) return false; - const v4_netaddr = ldk.NetAddress.constructor_ipv4(Uint8Array.from([42,0,42,1]), 9735); - assert(pm_b.new_inbound_connection(sock_b, ldk.Option_NetAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK); - const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_NetAddressZ.constructor_none()); + const v4_netaddr = ldk.SocketAddress.constructor_tcp_ip_v4(Uint8Array.from([42,0,42,1]), 9735); + assert(pm_b.new_inbound_connection(sock_b, ldk.Option_SocketAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK); + const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_SocketAddressZ.constructor_none()); 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); @@ -291,7 +293,7 @@ tests.push(async () => { assert(pm_a.get_peer_node_ids().length == 1); assert(pm_b.get_peer_node_ids().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), ldk.Option_ThirtyTwoBytesZ.constructor_none(), ldk.UserConfig.constructor_default()); if (!chan_create_res.is_ok()) return false; if (!update_done) return false; @@ -313,29 +315,30 @@ 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) { assert(msg.tlv_type() == 9998n); a_handled_msg = true; }, + 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_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 +354,36 @@ 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) { assert(msg.tlv_type() == 9999n); b_handled_msg = true; }, + 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, 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, @@ -415,9 +426,9 @@ tests.push(async () => { } } as ldk.SocketDescriptorInterface); - const v4_netaddr = ldk.NetAddress.constructor_ipv4(Uint8Array.from([42,0,42,1]), 9735); - assert(pm_b.new_inbound_connection(sock_b, ldk.Option_NetAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK); - const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_NetAddressZ.constructor_none()); + const v4_netaddr = ldk.SocketAddress.constructor_tcp_ip_v4(Uint8Array.from([42,0,42,1]), 9735); + assert(pm_b.new_inbound_connection(sock_b, ldk.Option_SocketAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK); + const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_SocketAddressZ.constructor_none()); 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); @@ -432,28 +443,28 @@ tests.push(async () => { assert(pm_b.get_peer_node_ids().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);