X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=node-net%2Ftest%2Ftest.mts;h=b9dac1b62c0cce09d48d726e7d78e9e58845c4c7;hb=0800f52508a2f2665042a0c41ca5e8b525160277;hp=86b6b3a2af9f1871fc5bfe6329da68f647fa0a9a;hpb=384d4ce1dd44cbd9d7d09cf6ff7818ba0c3ac29b;p=ldk-java diff --git a/node-net/test/test.mts b/node-net/test/test.mts index 86b6b3a2..b9dac1b6 100644 --- a/node-net/test/test.mts +++ b/node-net/test/test.mts @@ -13,13 +13,18 @@ const logger_a = ldk.Logger.new_impl({ } as ldk.LoggerInterface); const logger_b = logger_a; -const node_a_secret = new Uint8Array(32); -for (var i = 0; i < 32; i++) node_a_secret[i] = 42; +const node_a_seed = new Uint8Array(32); +for (var i = 0; i < 32; i++) node_a_seed[i] = 42; +const keys_manager_a = ldk.KeysManager.constructor_new(node_a_seed, 0xdeadbeefn, 0xdeadbeef); // The public key for a secret key of all 42s: -const node_a_pk = new Uint8Array([3, 91, 229, 233, 71, 130, 9, 103, 74, 150, 230, 15, 31, 3, 127, 97, 118, 84, 15, 208, 1, 250, 29, 100, 105, 71, 112, 197, 106, 119, 9, 196, 44]); +const node_a_pk = new Uint8Array([2, 199, 152, 57, 62, 230, 84, 174, 99, + 219, 13, 9, 134, 214, 253, 64, 62, + 214, 150, 255, 176, 173, 44, 221, 102, + 195, 152, 169, 215, 195, 79, 251, 240]); -const node_b_secret = new Uint8Array(32); -for (var i = 0; i < 32; i++) node_b_secret[i] = 43; +const node_b_seed = new Uint8Array(32); +for (var i = 0; i < 32; i++) node_b_seed[i] = 43; +const keys_manager_b = ldk.KeysManager.constructor_new(node_b_seed, 0xdeadbeefn, 0xdeadbeef); const rng_seed = new Uint8Array(32); const routing_handler = ldk.IgnoringMessageHandler.constructor_new().as_RoutingMessageHandler(); @@ -27,7 +32,7 @@ const chan_handler = ldk.ErroringMessageHandler.constructor_new().as_ChannelMess const cust_handler = ldk.IgnoringMessageHandler.constructor_new().as_CustomMessageHandler(); const onion_handler = ldk.IgnoringMessageHandler.constructor_new().as_OnionMessageHandler(); -const a_pm = ldk.PeerManager.constructor_new(chan_handler, routing_handler, onion_handler, node_a_secret, 0xdeadbeefn, rng_seed, logger_a, cust_handler); +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()); const a_net_handler = new node_net.NodeLDKNet(a_pm); var port = 10000; for (; port < 11000; port++) { @@ -38,7 +43,7 @@ for (; port < 11000; port++) { } catch(_) {} } -const b_pm = ldk.PeerManager.constructor_new(chan_handler, routing_handler, onion_handler, node_b_secret, 0xdeadbeefn, rng_seed, logger_b, cust_handler); +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()); const b_net_handler = new node_net.NodeLDKNet(b_pm); await b_net_handler.connect_peer("127.0.0.1", port, node_a_pk); @@ -59,7 +64,7 @@ await new Promise(resolve => { }, 500); }); -b_pm.disconnect_by_node_id(node_a_pk, false); +b_pm.disconnect_by_node_id(node_a_pk); await new Promise(resolve => { // Wait until A learns the connection is closed from the socket closure var timer: ReturnType; @@ -79,19 +84,19 @@ function arr_eq(a: number[]|Uint8Array, b: number[]|Uint8Array): boolean { } const v4_parse = node_net.NodeLDKNet["v4_addr_from_ip"]; -console.assert((v4_parse("127.0.0.1", 4242) as ldk.NetAddress_IPv4).port == 4242); -console.assert(arr_eq((v4_parse("127.0.0.1", 4242) as ldk.NetAddress_IPv4).addr, [127,0,0,1])); -console.assert(arr_eq((v4_parse("0.0.0.0", 4242) as ldk.NetAddress_IPv4).addr, [0,0,0,0])); +console.assert((v4_parse("127.0.0.1", 4242) as ldk.SocketAddress_TcpIpV4).port == 4242); +console.assert(arr_eq((v4_parse("127.0.0.1", 4242) as ldk.SocketAddress_TcpIpV4).addr, [127,0,0,1])); +console.assert(arr_eq((v4_parse("0.0.0.0", 4242) as ldk.SocketAddress_TcpIpV4).addr, [0,0,0,0])); const v6_parse = node_net.NodeLDKNet["v6_addr_from_ip"]; -console.assert((v6_parse("::", 4242) as ldk.NetAddress_IPv4).port == 4242); -console.assert(arr_eq((v6_parse("::", 4242) as ldk.NetAddress_IPv6).addr, +console.assert((v6_parse("::", 4242) as ldk.SocketAddress_TcpIpV4).port == 4242); +console.assert(arr_eq((v6_parse("::", 4242) as ldk.SocketAddress_TcpIpV6).addr, [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0])); -console.assert(arr_eq((v6_parse("fe80::", 4242) as ldk.NetAddress_IPv6).addr, +console.assert(arr_eq((v6_parse("fe80::", 4242) as ldk.SocketAddress_TcpIpV6).addr, [0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0])); -console.assert(arr_eq((v6_parse("fe80::42", 4242) as ldk.NetAddress_IPv6).addr, +console.assert(arr_eq((v6_parse("fe80::42", 4242) as ldk.SocketAddress_TcpIpV6).addr, [0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0x42])); -console.assert(arr_eq((v6_parse("fe80:A:b::", 4242) as ldk.NetAddress_IPv6).addr, +console.assert(arr_eq((v6_parse("fe80:A:b::", 4242) as ldk.SocketAddress_TcpIpV6).addr, [0xfe,0x80,0,0xa,0,0xb,0,0,0,0,0,0,0,0,0,0])); -console.assert(arr_eq((v6_parse("2001:1:bad::beef:cafe", 4242) as ldk.NetAddress_IPv6).addr, +console.assert(arr_eq((v6_parse("2001:1:bad::beef:cafe", 4242) as ldk.SocketAddress_TcpIpV6).addr, [0x20, 0x01, 0, 1, 0xb, 0xad, 0, 0, 0, 0, 0, 0, 0xbe, 0xef, 0xca, 0xfe]));