X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Ftest%2Ftests.mts;h=58be33ba107236201211cfddc156ed7f5321e5be;hb=8e33aef6755f40a31fc65245d28e38aabe94e450;hp=db0fe326618841a51b77104421565428272a66a1;hpb=4ea6734c714946d737c5f43dde2a7ba12fc733cc;p=ldk-java diff --git a/ts/test/tests.mts b/ts/test/tests.mts index db0fe326..58be33ba 100644 --- a/ts/test/tests.mts +++ b/ts/test/tests.mts @@ -60,11 +60,9 @@ tests.push(async () => { var seed_counter = 0; class Node { node_id: Uint8Array; - node_secret: Uint8Array; constructor(public chan_man: ldk.ChannelManager, public tx_broadcasted: Promise, - public logger: ldk.Logger, public keys_interface: ldk.KeysInterface) { + public logger: ldk.Logger, public keys_manager: ldk.KeysManager) { this.node_id = chan_man.get_our_node_id(); - this.node_secret = (keys_interface.get_node_secret(ldk.Recipient.LDKRecipient_Node) as ldk.Result_SecretKeyNoneZ_OK).res; } } function get_chanman(): Node { @@ -76,7 +74,11 @@ function get_chanman(): Node { var tx_broadcaster: ldk.BroadcasterInterface; const tx_broadcasted: Promise = new Promise((resolve, _reject) => { tx_broadcaster = ldk.BroadcasterInterface.new_impl({ - broadcast_transaction(tx: Uint8Array): void { console.log("Tx Broadcast: " + tx); resolve(tx); } + broadcast_transactions(txn: Uint8Array[]): void { + for (const tx of txn) { + console.log("Tx Broadcast: " + tx); resolve(tx); + } + } } as ldk.BroadcasterInterfaceInterface); }); const logger = ldk.Logger.new_impl({ @@ -101,12 +103,18 @@ function get_chanman(): Node { seed.fill(seed_counter); seed_counter++; const keys_manager = ldk.KeysManager.constructor_new(seed, BigInt(42), 42); - const keys_interface = keys_manager.as_KeysInterface(); - const config = ldk.UserConfig.constructor_default(); - const params = ldk.ChainParameters.constructor_new(ldk.Network.LDKNetwork_Testnet, ldk.BestBlock.constructor_from_genesis(ldk.Network.LDKNetwork_Testnet)); - const chan_man = ldk.ChannelManager.constructor_new(fee_est, chain_watch, tx_broadcaster!, logger, keys_interface, config, params); - return new Node(chan_man, tx_broadcasted, logger, keys_interface); + 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 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); } function exchange_messages(a: ldk.ChannelManager, b: ldk.ChannelManager) { @@ -122,12 +130,10 @@ function exchange_messages(a: ldk.ChannelManager, b: ldk.ChannelManager) { const msg = msgs[j]; if (msg instanceof ldk.MessageSendEvent_SendOpenChannel) { if (!array_eq(msg.node_id, to.get_our_node_id())) return false; - const features = from.as_ChannelMessageHandler().provided_init_features(to.get_our_node_id()); - to.as_ChannelMessageHandler().handle_open_channel(from.get_our_node_id(), features, msg.msg); + to.as_ChannelMessageHandler().handle_open_channel(from.get_our_node_id(), msg.msg); } else if (msg instanceof ldk.MessageSendEvent_SendAcceptChannel) { if (!array_eq(msg.node_id, to.get_our_node_id())) return false; - const features = from.as_ChannelMessageHandler().provided_init_features(to.get_our_node_id()); - to.as_ChannelMessageHandler().handle_accept_channel(from.get_our_node_id(), features, msg.msg); + to.as_ChannelMessageHandler().handle_accept_channel(from.get_our_node_id(), msg.msg); } else if (msg instanceof ldk.MessageSendEvent_SendFundingCreated) { if (!array_eq(msg.node_id, to.get_our_node_id())) return false; to.as_ChannelMessageHandler().handle_funding_created(from.get_our_node_id(), msg.msg); @@ -173,12 +179,12 @@ 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_NetAddressZ.constructor_none())); - b.chan_man.as_ChannelMessageHandler().peer_connected(a.chan_man.get_our_node_id(), ldk.Init.constructor_new(features, ldk.Option_NetAddressZ.constructor_none())); + 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()); 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; @@ -221,8 +227,12 @@ tests.push(async () => { const b = get_chanman(); const ignorer = ldk.IgnoringMessageHandler.constructor_new(); - const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), ignorer.as_OnionMessageHandler(), a.node_secret, 0xdeadbeef, a.node_secret, a.logger, ignorer.as_CustomMessageHandler()); - const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), ignorer.as_OnionMessageHandler(), b.node_secret, 0xdeadbeef, b.node_secret, b.logger, ignorer.as_CustomMessageHandler()); + const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), + ignorer.as_OnionMessageHandler(), ignorer.as_CustomMessageHandler(), + 0xdeadbeef, a.keys_manager.as_EntropySource().get_secure_random_bytes(), a.logger, a.keys_manager.as_NodeSigner()); + const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), + ignorer.as_OnionMessageHandler(), ignorer.as_CustomMessageHandler(), + 0xdeadbeef, b.keys_manager.as_EntropySource().get_secure_random_bytes(), b.logger, b.keys_manager.as_NodeSigner()); var sock_b: ldk.SocketDescriptor; const sock_a = ldk.SocketDescriptor.new_impl({ @@ -258,16 +268,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); @@ -303,65 +313,77 @@ 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))); + } 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_interface, a.logger, 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 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_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); }, - peer_connected(their_node_id: Uint8Array, init: ldk.Init): ldk.Result_NoneNoneZ { - return underlying_om_a.as_OnionMessageHandler().peer_connected(their_node_id, init) + peer_connected(their_node_id: Uint8Array, init: ldk.Init, inbound: boolean): ldk.Result_NoneNoneZ { + return underlying_om_a.as_OnionMessageHandler().peer_connected(their_node_id, init, inbound) }, - peer_disconnected(their_node_id: Uint8Array, no_connection_possible: boolean) { - underlying_om_a.as_OnionMessageHandler().peer_disconnected(their_node_id, no_connection_possible); + peer_disconnected(their_node_id: Uint8Array) { + underlying_om_a.as_OnionMessageHandler().peer_disconnected(their_node_id); }, provided_node_features(): ldk.NodeFeatures { return underlying_om_a.as_OnionMessageHandler().provided_node_features(); }, 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))); + } 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 om_b = ldk.OnionMessenger.constructor_new(b.keys_interface, b.logger, om_handler_b); + 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); - const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), om_a, a.node_secret, 0xdeadbeef, a.node_secret, a.logger, ignorer.as_CustomMessageHandler()); - const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), om_b.as_OnionMessageHandler(), b.node_secret, 0xdeadbeef, b.node_secret, b.logger, ignorer.as_CustomMessageHandler()); + const pm_a = ldk.PeerManager.constructor_new(a.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), + om_a, ignorer.as_CustomMessageHandler(), 0xdeadbeef, + a.keys_manager.as_EntropySource().get_secure_random_bytes(), a.logger, a.keys_manager.as_NodeSigner()); + const pm_b = ldk.PeerManager.constructor_new(b.chan_man.as_ChannelMessageHandler(), ignorer.as_RoutingMessageHandler(), + om_b.as_OnionMessageHandler(), ignorer.as_CustomMessageHandler(), 0xdeadbeef, + b.keys_manager.as_EntropySource().get_secure_random_bytes(), b.logger, b.keys_manager.as_NodeSigner()); var sock_b: ldk.SocketDescriptor; const sock_a = ldk.SocketDescriptor.new_impl({ @@ -397,9 +419,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); @@ -413,25 +435,29 @@ tests.push(async () => { assert(pm_a.get_peer_node_ids().length == 1); assert(pm_b.get_peer_node_ids().length == 1); - underlying_om_a.send_custom_onion_message([], ldk.Destination.constructor_node(b.node_id), ldk.CustomOnionMessageContents.new_impl({ + underlying_om_a.send_onion_message( + ldk.OnionMessagePath.constructor_new([], ldk.Destination.constructor_node(b.node_id)), + 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); + } as ldk.OnionMessageContentsInterface), null); pm_a.process_events(); assert(b_handled_msg); - om_b.send_custom_onion_message([], ldk.Destination.constructor_node(a.node_id), ldk.CustomOnionMessageContents.new_impl({ + om_b.send_onion_message( + ldk.OnionMessagePath.constructor_new([], ldk.Destination.constructor_node(a.node_id)), + 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); + } as ldk.OnionMessageContentsInterface), null); pm_b.process_events(); assert(a_handled_msg); @@ -440,14 +466,13 @@ tests.push(async () => { tests.push(async () => { // Test that we can do basic locking of a NetworkGraph - const genesis_hash = new Uint8Array([0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xd6, 0x68, 0x9c, 0x08, 0x5a, 0xe1, 0x65, 0x83, 0x1e, 0x93, 0x4f, 0xf7, 0x63, 0xae, 0x46, 0xa2, 0xa6, 0xc1, 0x72, 0xb3, 0xf1, 0xb6, 0x0a, 0x8c, 0xe2, 0x6f]); const logger = ldk.Logger.new_impl({ log(record: ldk.Record): void { if (record.get_level() != ldk.Level.LDKLevel_Gossip) console.log(record.get_module_path() + ": " + record.get_args()); } } as ldk.LoggerInterface); - const network_graph = ldk.NetworkGraph.constructor_new(genesis_hash, logger); + const network_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet, logger); const graph_lock_1 = network_graph.read_only(); graph_lock_1.free(); const graph_lock_2 = network_graph.read_only();