Skip to content

Commit 0800f52

Browse files
TheBlueMattTheBlueMatt
committed
[TS] Update tests and node-net for new LDK 0.0.117 API
1 parent 9be6195 commit 0800f52

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎node-net/net.mts

+9-9
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ export class NodeLDKNet {
9797
return descriptor;
9898
}
9999

100-
private static v4_addr_from_ip(ip: string, port: number): ldk.NetAddress {
100+
private static v4_addr_from_ip(ip: string, port: number): ldk.SocketAddress {
101101
const sockaddr = ip.split(".").map(parseFloat);
102-
return ldk.NetAddress.constructor_ipv4(new Uint8Array(sockaddr), port);
102+
return ldk.SocketAddress.constructor_tcp_ip_v4(new Uint8Array(sockaddr), port);
103103
}
104-
private static v6_addr_from_ip(ip: string, port: number): ldk.NetAddress {
104+
private static v6_addr_from_ip(ip: string, port: number): ldk.SocketAddress {
105105
const sockaddr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
106106
const halves = ip.split("::"); // either one or two elements
107107
const first_half = halves[0].split(":");
@@ -118,20 +118,20 @@ export class NodeLDKNet {
118118
sockaddr[15 - idx*2] = v & 0xff;
119119
}
120120
}
121-
return ldk.NetAddress.constructor_ipv6(new Uint8Array(sockaddr), port);
121+
return ldk.SocketAddress.constructor_tcp_ip_v6(new Uint8Array(sockaddr), port);
122122
}
123123

124-
private static get_addr_from_socket(socket: net.Socket): ldk.Option_NetAddressZ {
124+
private static get_addr_from_socket(socket: net.Socket): ldk.Option_SocketAddressZ {
125125
const addr = socket.remoteAddress;
126126
if (addr === undefined)
127-
return ldk.Option_NetAddressZ.constructor_none();
127+
return ldk.Option_SocketAddressZ.constructor_none();
128128
if (net.isIPv4(addr)) {
129-
return ldk.Option_NetAddressZ.constructor_some(NodeLDKNet.v4_addr_from_ip(addr, socket.remotePort));
129+
return ldk.Option_SocketAddressZ.constructor_some(NodeLDKNet.v4_addr_from_ip(addr, socket.remotePort));
130130
}
131131
if (net.isIPv6(addr)) {
132-
return ldk.Option_NetAddressZ.constructor_some(NodeLDKNet.v6_addr_from_ip(addr, socket.remotePort));
132+
return ldk.Option_SocketAddressZ.constructor_some(NodeLDKNet.v6_addr_from_ip(addr, socket.remotePort));
133133
}
134-
return ldk.Option_NetAddressZ.constructor_none();
134+
return ldk.Option_SocketAddressZ.constructor_none();
135135
}
136136

137137
/**

‎node-net/test/test.mts

+9-9
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,19 @@ function arr_eq(a: number[]|Uint8Array, b: number[]|Uint8Array): boolean {
8484
}
8585

8686
const v4_parse = node_net.NodeLDKNet["v4_addr_from_ip"];
87-
console.assert((v4_parse("127.0.0.1", 4242) as ldk.NetAddress_IPv4).port == 4242);
88-
console.assert(arr_eq((v4_parse("127.0.0.1", 4242) as ldk.NetAddress_IPv4).addr, [127,0,0,1]));
89-
console.assert(arr_eq((v4_parse("0.0.0.0", 4242) as ldk.NetAddress_IPv4).addr, [0,0,0,0]));
87+
console.assert((v4_parse("127.0.0.1", 4242) as ldk.SocketAddress_TcpIpV4).port == 4242);
88+
console.assert(arr_eq((v4_parse("127.0.0.1", 4242) as ldk.SocketAddress_TcpIpV4).addr, [127,0,0,1]));
89+
console.assert(arr_eq((v4_parse("0.0.0.0", 4242) as ldk.SocketAddress_TcpIpV4).addr, [0,0,0,0]));
9090

9191
const v6_parse = node_net.NodeLDKNet["v6_addr_from_ip"];
92-
console.assert((v6_parse("::", 4242) as ldk.NetAddress_IPv4).port == 4242);
93-
console.assert(arr_eq((v6_parse("::", 4242) as ldk.NetAddress_IPv6).addr,
92+
console.assert((v6_parse("::", 4242) as ldk.SocketAddress_TcpIpV4).port == 4242);
93+
console.assert(arr_eq((v6_parse("::", 4242) as ldk.SocketAddress_TcpIpV6).addr,
9494
[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]));
95-
console.assert(arr_eq((v6_parse("fe80::", 4242) as ldk.NetAddress_IPv6).addr,
95+
console.assert(arr_eq((v6_parse("fe80::", 4242) as ldk.SocketAddress_TcpIpV6).addr,
9696
[0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0]));
97-
console.assert(arr_eq((v6_parse("fe80::42", 4242) as ldk.NetAddress_IPv6).addr,
97+
console.assert(arr_eq((v6_parse("fe80::42", 4242) as ldk.SocketAddress_TcpIpV6).addr,
9898
[0xfe,0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0x42]));
99-
console.assert(arr_eq((v6_parse("fe80:A:b::", 4242) as ldk.NetAddress_IPv6).addr,
99+
console.assert(arr_eq((v6_parse("fe80:A:b::", 4242) as ldk.SocketAddress_TcpIpV6).addr,
100100
[0xfe,0x80,0,0xa,0,0xb,0,0,0,0,0,0,0,0,0,0]));
101-
console.assert(arr_eq((v6_parse("2001:1:bad::beef:cafe", 4242) as ldk.NetAddress_IPv6).addr,
101+
console.assert(arr_eq((v6_parse("2001:1:bad::beef:cafe", 4242) as ldk.SocketAddress_TcpIpV6).addr,
102102
[0x20, 0x01, 0, 1, 0xb, 0xad, 0, 0, 0, 0, 0, 0, 0xbe, 0xef, 0xca, 0xfe]));

‎ts/test/tests.mts

+10-10
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ tests.push(async () => {
179179

180180
const features = a.chan_man.as_ChannelMessageHandler().provided_init_features(b.chan_man.get_our_node_id());
181181

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);
182+
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);
183+
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);
184184

185185
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());
186186
if (chan_create_err.is_ok()) return false;
187-
if (!(chan_create_err instanceof ldk.Result__u832APIErrorZ_Err)) return false;
187+
if (!(chan_create_err instanceof ldk.Result_ThirtyTwoBytesAPIErrorZ_Err)) return false;
188188
if (!(chan_create_err.err instanceof ldk.APIError_APIMisuseError)) return false;
189189
if (chan_create_err.err.err != "Channel value must be at least 1000 satoshis. It was 0") return false;
190190

@@ -268,16 +268,16 @@ tests.push(async () => {
268268
}
269269
} as ldk.SocketDescriptorInterface);
270270

271-
const update_fut = a.chan_man.get_persistable_update_future();
271+
const update_fut = a.chan_man.get_event_or_persistence_needed_future();
272272
var update_done = false;
273273
update_fut.register_callback_fn(ldk.FutureCallback.new_impl({
274274
call(): void { update_done = true; }
275275
}));
276276
if (update_done) return false;
277277

278-
const v4_netaddr = ldk.NetAddress.constructor_ipv4(Uint8Array.from([42,0,42,1]), 9735);
279-
assert(pm_b.new_inbound_connection(sock_b, ldk.Option_NetAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK);
280-
const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_NetAddressZ.constructor_none());
278+
const v4_netaddr = ldk.SocketAddress.constructor_tcp_ip_v4(Uint8Array.from([42,0,42,1]), 9735);
279+
assert(pm_b.new_inbound_connection(sock_b, ldk.Option_SocketAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK);
280+
const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_SocketAddressZ.constructor_none());
281281
if (!(init_bytes instanceof ldk.Result_CVec_u8ZPeerHandleErrorZ_OK)) return false;
282282
assert(pm_b.read_event(sock_b, init_bytes.res) instanceof ldk.Result_boolPeerHandleErrorZ_OK);
283283

@@ -415,9 +415,9 @@ tests.push(async () => {
415415
}
416416
} as ldk.SocketDescriptorInterface);
417417

418-
const v4_netaddr = ldk.NetAddress.constructor_ipv4(Uint8Array.from([42,0,42,1]), 9735);
419-
assert(pm_b.new_inbound_connection(sock_b, ldk.Option_NetAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK);
420-
const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_NetAddressZ.constructor_none());
418+
const v4_netaddr = ldk.SocketAddress.constructor_tcp_ip_v4(Uint8Array.from([42,0,42,1]), 9735);
419+
assert(pm_b.new_inbound_connection(sock_b, ldk.Option_SocketAddressZ.constructor_some(v4_netaddr)) instanceof ldk.Result_NonePeerHandleErrorZ_OK);
420+
const init_bytes = pm_a.new_outbound_connection(b.node_id, sock_a, ldk.Option_SocketAddressZ.constructor_none());
421421
if (!(init_bytes instanceof ldk.Result_CVec_u8ZPeerHandleErrorZ_OK)) return false;
422422
assert(pm_b.read_event(sock_b, init_bytes.res) instanceof ldk.Result_boolPeerHandleErrorZ_OK);
423423

0 commit comments

Comments
 (0)