Update bindings to latest upstream.

[ldk-java] / ts / structs / RoutingMessageHandler.ts

diff --git a/ts/structs/RoutingMessageHandler.ts b/ts/structs/RoutingMessageHandler.ts
index f7fc16cf938e284e9406682f0c967cd72cc3af9b..04d3d5f54e87a252953cde2e8b96a2923c542834 100644 (file)
--- a/ts/structs/RoutingMessageHandler.ts
+++ b/ts/structs/RoutingMessageHandler.ts
@@ -61,14 +61,14 @@ import * as bindings from '../bindings' // TODO: figure out location
 
                                                get_next_channel_announcements (starting_point: number, batch_amount: number): number[] {
                                                        ThreeTuple<ChannelAnnouncement, ChannelUpdate, ChannelUpdate>[] ret = arg.get_next_channel_announcements(starting_point, batch_amount);
-                               result: number[] = (number[])Arrays.stream(ret).map(arr_conv_63 -> bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(arr_conv_63.a == null ? 0 : arr_conv_63.a.ptr & ~1/*XXX: this.ptrs_to.add(arr_conv_63_a)*/, arr_conv_63.b == null ? 0 : arr_conv_63.b.ptr & ~1/*XXX: this.ptrs_to.add(arr_conv_63_b)*/, arr_conv_63.c == null ? 0 : arr_conv_63.c.ptr & ~1/*XXX: this.ptrs_to.add(arr_conv_63_c)*/)).toArray();
+                               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<ChannelAnnouncement, ChannelUpdate, ChannelUpdate>  */;
                                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[] = (number[])Arrays.stream(ret).map(arr_conv_18 -> arr_conv_18 == null ? 0 : arr_conv_18.ptr & ~1).toArray();
+                               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  */;
                                return result;
                                                },
@@ -80,6 +80,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 
                                                handle_reply_channel_range (their_node_id: Uint8Array, msg: number): number {
                                                        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;
                                return result;
@@ -87,6 +88,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 
                                                handle_reply_short_channel_ids_end (their_node_id: Uint8Array, msg: number): number {
                                                        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;
                                return result;
@@ -94,6 +96,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 
                                                handle_query_channel_range (their_node_id: Uint8Array, msg: number): number {
                                                        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;
                                return result;
@@ -101,6 +104,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 
                                                handle_query_short_channel_ids (their_node_id: Uint8Array, msg: number): number {
                                                        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;
                                return result;
@@ -158,30 +162,39 @@ import * as bindings from '../bindings' // TODO: figure out location
 
        public ThreeTuple<ChannelAnnouncement, ChannelUpdate, ChannelUpdate>[] 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<ChannelAnnouncement, ChannelUpdate, ChannelUpdate>[] arr_conv_63_arr = new ThreeTuple[ret.length];
+               ThreeTuple<ChannelAnnouncement, ChannelUpdate, ChannelUpdate>[] ret_conv_63_arr = new ThreeTuple[ret.length];
                for (int l = 0; l < ret.length; l++) {
-                       number arr_conv_63 = ret[l];
-                       number arr_conv_63_a = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(arr_conv_63);
-                       const arr_conv_63_a_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, arr_conv_63_a);;
-                       number arr_conv_63_b = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(arr_conv_63);
-                       const arr_conv_63_b_hu_conv: ChannelUpdate = new ChannelUpdate(null, arr_conv_63_b);;
-                       number arr_conv_63_c = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(arr_conv_63);
-                       const arr_conv_63_c_hu_conv: ChannelUpdate = new ChannelUpdate(null, arr_conv_63_c);;
-                       ThreeTuple<ChannelAnnouncement, ChannelUpdate, ChannelUpdate> arr_conv_63_conv = new ThreeTuple<ChannelAnnouncement, ChannelUpdate, ChannelUpdate>(arr_conv_63_a_hu_conv, arr_conv_63_b_hu_conv, arr_conv_63_c_hu_conv);
-                       arr_conv_63_arr[l] = arr_conv_63_conv;
+                       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<ChannelAnnouncement, ChannelUpdate, ChannelUpdate> ret_conv_63_conv = new ThreeTuple<ChannelAnnouncement, ChannelUpdate, ChannelUpdate>(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;
                }
-               return arr_conv_63_arr;
+               return ret_conv_63_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);
-               NodeAnnouncement[] arr_conv_18_arr = new NodeAnnouncement[ret.length];
+               NodeAnnouncement[] ret_conv_18_arr = new NodeAnnouncement[ret.length];
                for (int s = 0; s < ret.length; s++) {
-                       number arr_conv_18 = ret[s];
-                       const arr_conv_18_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, arr_conv_18);
-                       arr_conv_18_arr[s] = arr_conv_18_hu_conv;
+                       number ret_conv_18 = ret[s];
+                       const ret_conv_18_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, ret_conv_18);
+                       ret_conv_18_hu_conv.ptrs_to.add(this);
+                       ret_conv_18_arr[s] = ret_conv_18_hu_conv;
                }
-               return arr_conv_18_arr;
+               return ret_conv_18_arr;
        }
 
        public void sync_routing_table(Uint8Array their_node_id, Init init) {