X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FRoutingMessageHandler.ts;h=263b67c09ef8c6401661d3b1deab8308ad21bc04;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=04d3d5f54e87a252953cde2e8b96a2923c542834;hpb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;p=ldk-java diff --git a/ts/structs/RoutingMessageHandler.ts b/ts/structs/RoutingMessageHandler.ts index 04d3d5f5..263b67c0 100644 --- a/ts/structs/RoutingMessageHandler.ts +++ b/ts/structs/RoutingMessageHandler.ts @@ -36,40 +36,33 @@ import * as bindings from '../bindings' // TODO: figure out location handle_node_announcement (msg: number): number { const msg_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, msg); Result_boolLightningErrorZ ret = arg.handle_node_announcement(msg_hu_conv); - result: number = ret != null ? ret.ptr : 0; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, handle_channel_announcement (msg: number): number { const msg_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, msg); Result_boolLightningErrorZ ret = arg.handle_channel_announcement(msg_hu_conv); - result: number = ret != null ? ret.ptr : 0; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, handle_channel_update (msg: number): number { const msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, msg); Result_boolLightningErrorZ ret = arg.handle_channel_update(msg_hu_conv); - result: number = ret != null ? ret.ptr : 0; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, - handle_htlc_fail_channel_update (update: number): void { - HTLCFailChannelUpdate update_hu_conv = HTLCFailChannelUpdate.constr_from_ptr(update); - arg.handle_htlc_fail_channel_update(update_hu_conv); - }, - get_next_channel_announcements (starting_point: number, batch_amount: number): number[] { - ThreeTuple[] ret = arg.get_next_channel_announcements(starting_point, batch_amount); - result: number[] = Arrays.stream(ret).map(ret_conv_63 -> bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(ret_conv_63.a == null ? 0 : ret_conv_63.a.ptr & ~1, ret_conv_63.b == null ? 0 : ret_conv_63.b.ptr & ~1, ret_conv_63.c == null ? 0 : ret_conv_63.c.ptr & ~1)).toArray(number[]::new); - /* TODO 2 ThreeTuple */; + ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] ret = arg.get_next_channel_announcements(starting_point, batch_amount); + result: number[] = ret != null ? Arrays.stream(ret).map(ret_conv_59 -> ret_conv_59 == null ? 0 : ret_conv_59.clone_ptr()).toArray(number[]::new) : null; return result; }, get_next_node_announcements (starting_point: Uint8Array, batch_amount: number): number[] { NodeAnnouncement[] ret = arg.get_next_node_announcements(starting_point, batch_amount); - result: number[] = Arrays.stream(ret).map(ret_conv_18 -> ret_conv_18 == null ? 0 : ret_conv_18.ptr & ~1).toArray(number[]::new); - /* TODO 2 NodeAnnouncement */; + result: number[] = ret != null ? Arrays.stream(ret).map(ret_conv_18 -> ret_conv_18 == null ? 0 : ret_conv_18.clone_ptr()).toArray(number[]::new) : null; return result; }, @@ -82,7 +75,7 @@ import * as bindings from '../bindings' // TODO: figure out location const msg_hu_conv: ReplyChannelRange = new ReplyChannelRange(null, msg); msg_hu_conv.ptrs_to.add(this); Result_NoneLightningErrorZ ret = arg.handle_reply_channel_range(their_node_id, msg_hu_conv); - result: number = ret != null ? ret.ptr : 0; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, @@ -90,7 +83,7 @@ import * as bindings from '../bindings' // TODO: figure out location const msg_hu_conv: ReplyShortChannelIdsEnd = new ReplyShortChannelIdsEnd(null, msg); msg_hu_conv.ptrs_to.add(this); Result_NoneLightningErrorZ ret = arg.handle_reply_short_channel_ids_end(their_node_id, msg_hu_conv); - result: number = ret != null ? ret.ptr : 0; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, @@ -98,7 +91,7 @@ import * as bindings from '../bindings' // TODO: figure out location const msg_hu_conv: QueryChannelRange = new QueryChannelRange(null, msg); msg_hu_conv.ptrs_to.add(this); Result_NoneLightningErrorZ ret = arg.handle_query_channel_range(their_node_id, msg_hu_conv); - result: number = ret != null ? ret.ptr : 0; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, @@ -106,7 +99,7 @@ import * as bindings from '../bindings' // TODO: figure out location const msg_hu_conv: QueryShortChannelIds = new QueryShortChannelIds(null, msg); msg_hu_conv.ptrs_to.add(this); Result_NoneLightningErrorZ ret = arg.handle_query_short_channel_ids(their_node_id, msg_hu_conv); - result: number = ret != null ? ret.ptr : 0; + result: number = ret == null ? 0 : ret.clone_ptr(); return result; }, @@ -120,8 +113,7 @@ import * as bindings from '../bindings' // TODO: figure out location handle_node_announcement(msg: NodeAnnouncement): Result_boolLightningErrorZ; handle_channel_announcement(msg: ChannelAnnouncement): Result_boolLightningErrorZ; handle_channel_update(msg: ChannelUpdate): Result_boolLightningErrorZ; - handle_htlc_fail_channel_update(update: HTLCFailChannelUpdate): void; - get_next_channel_announcements(starting_point: number, batch_amount: number): ThreeTuple[]; + get_next_channel_announcements(starting_point: number, batch_amount: number): ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[]; get_next_node_announcements(starting_point: Uint8Array, batch_amount: number): NodeAnnouncement[]; sync_routing_table(their_node_id: Uint8Array, init: Init): void; handle_reply_channel_range(their_node_id: Uint8Array, msg: ReplyChannelRange): Result_NoneLightningErrorZ; @@ -155,38 +147,20 @@ import * as bindings from '../bindings' // TODO: figure out location return ret_hu_conv; } - public void handle_htlc_fail_channel_update(HTLCFailChannelUpdate update) { - bindings.RoutingMessageHandler_handle_htlc_fail_channel_update(this.ptr, update == null ? 0 : update.ptr & ~1); - this.ptrs_to.add(update); - } - - public ThreeTuple[] get_next_channel_announcements(number starting_point, number batch_amount) { + public ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] get_next_channel_announcements(number starting_point, number batch_amount) { number[] ret = bindings.RoutingMessageHandler_get_next_channel_announcements(this.ptr, starting_point, batch_amount); - ThreeTuple[] ret_conv_63_arr = new ThreeTuple[ret.length]; - for (int l = 0; l < ret.length; l++) { - number ret_conv_63 = ret[l]; - number ret_conv_63_a = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(ret_conv_63); - const ret_conv_63_a_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, ret_conv_63_a); - ret_conv_63_a_hu_conv.ptrs_to.add(this);; - number ret_conv_63_b = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(ret_conv_63); - const ret_conv_63_b_hu_conv: ChannelUpdate = new ChannelUpdate(null, ret_conv_63_b); - ret_conv_63_b_hu_conv.ptrs_to.add(this);; - number ret_conv_63_c = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(ret_conv_63); - const ret_conv_63_c_hu_conv: ChannelUpdate = new ChannelUpdate(null, ret_conv_63_c); - ret_conv_63_c_hu_conv.ptrs_to.add(this);; - ThreeTuple ret_conv_63_conv = new ThreeTuple(ret_conv_63_a_hu_conv, ret_conv_63_b_hu_conv, ret_conv_63_c_hu_conv, () -> { - bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(ret_conv_63); - }); - ret_conv_63_a_hu_conv.ptrs_to.add(ret_conv_63_conv); - ret_conv_63_b_hu_conv.ptrs_to.add(ret_conv_63_conv); - ret_conv_63_c_hu_conv.ptrs_to.add(ret_conv_63_conv); - ret_conv_63_arr[l] = ret_conv_63_conv; + ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] ret_conv_59_arr = new ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[ret.length]; + for (int h = 0; h < ret.length; h++) { + number ret_conv_59 = ret[h]; + ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ ret_conv_59_hu_conv = new ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ(null, ret_conv_59); + ret_conv_59_hu_conv.ptrs_to.add(this); + ret_conv_59_arr[h] = ret_conv_59_hu_conv; } - return ret_conv_63_arr; + return ret_conv_59_arr; } public NodeAnnouncement[] get_next_node_announcements(Uint8Array starting_point, number batch_amount) { - number[] ret = bindings.RoutingMessageHandler_get_next_node_announcements(this.ptr, starting_point, batch_amount); + number[] ret = bindings.RoutingMessageHandler_get_next_node_announcements(this.ptr, InternalUtils.check_arr_len(starting_point, 33), batch_amount); NodeAnnouncement[] ret_conv_18_arr = new NodeAnnouncement[ret.length]; for (int s = 0; s < ret.length; s++) { number ret_conv_18 = ret[s]; @@ -198,35 +172,31 @@ import * as bindings from '../bindings' // TODO: figure out location } public void sync_routing_table(Uint8Array their_node_id, Init init) { - bindings.RoutingMessageHandler_sync_routing_table(this.ptr, their_node_id, init == null ? 0 : init.ptr & ~1); + bindings.RoutingMessageHandler_sync_routing_table(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), init == null ? 0 : init.ptr & ~1); this.ptrs_to.add(init); } public Result_NoneLightningErrorZ handle_reply_channel_range(Uint8Array their_node_id, ReplyChannelRange msg) { - number ret = bindings.RoutingMessageHandler_handle_reply_channel_range(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1); + number ret = bindings.RoutingMessageHandler_handle_reply_channel_range(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1); Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); - this.ptrs_to.add(msg); return ret_hu_conv; } public Result_NoneLightningErrorZ handle_reply_short_channel_ids_end(Uint8Array their_node_id, ReplyShortChannelIdsEnd msg) { - number ret = bindings.RoutingMessageHandler_handle_reply_short_channel_ids_end(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1); + number ret = bindings.RoutingMessageHandler_handle_reply_short_channel_ids_end(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1); Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); - this.ptrs_to.add(msg); return ret_hu_conv; } public Result_NoneLightningErrorZ handle_query_channel_range(Uint8Array their_node_id, QueryChannelRange msg) { - number ret = bindings.RoutingMessageHandler_handle_query_channel_range(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1); + number ret = bindings.RoutingMessageHandler_handle_query_channel_range(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1); Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); - this.ptrs_to.add(msg); return ret_hu_conv; } public Result_NoneLightningErrorZ handle_query_short_channel_ids(Uint8Array their_node_id, QueryShortChannelIds msg) { - number ret = bindings.RoutingMessageHandler_handle_query_short_channel_ids(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1); + number ret = bindings.RoutingMessageHandler_handle_query_short_channel_ids(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1); Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); - this.ptrs_to.add(msg); return ret_hu_conv; }