X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRoutingMessageHandler.java;h=4efd6b24b52b3843344da8268be283a83a5d6736;hb=276893d3b8bd3fcb2bb10e3cab73a69d34831909;hp=0f3ad91d159d8c29cf2af9e254696f3dee364d8e;hpb=a26d77400b9be7cb401019e8562edb515b70ed41;p=ldk-java diff --git a/src/main/java/org/ldk/structs/RoutingMessageHandler.java b/src/main/java/org/ldk/structs/RoutingMessageHandler.java index 0f3ad91d..4efd6b24 100644 --- a/src/main/java/org/ldk/structs/RoutingMessageHandler.java +++ b/src/main/java/org/ldk/structs/RoutingMessageHandler.java @@ -9,9 +9,10 @@ import java.util.Arrays; public class RoutingMessageHandler extends CommonBase { final bindings.LDKRoutingMessageHandler bindings_instance; RoutingMessageHandler(Object _dummy, long ptr) { super(ptr); bindings_instance = null; } - private RoutingMessageHandler(bindings.LDKRoutingMessageHandler arg) { - super(bindings.LDKRoutingMessageHandler_new(arg)); + private RoutingMessageHandler(bindings.LDKRoutingMessageHandler arg, bindings.LDKMessageSendEventsProvider MessageSendEventsProvider) { + super(bindings.LDKRoutingMessageHandler_new(arg, MessageSendEventsProvider)); this.ptrs_to.add(arg); + this.ptrs_to.add(MessageSendEventsProvider); this.bindings_instance = arg; } @Override @SuppressWarnings("deprecation") @@ -26,29 +27,32 @@ public class RoutingMessageHandler extends CommonBase { void handle_htlc_fail_channel_update(HTLCFailChannelUpdate update); ThreeTuple[] get_next_channel_announcements(long starting_point, byte batch_amount); NodeAnnouncement[] get_next_node_announcements(byte[] starting_point, byte batch_amount); - boolean should_request_full_sync(byte[] node_id); + void sync_routing_table(byte[] their_node_id, Init init); + Result_NoneLightningErrorZ handle_reply_channel_range(byte[] their_node_id, ReplyChannelRange msg); + Result_NoneLightningErrorZ handle_reply_short_channel_ids_end(byte[] their_node_id, ReplyShortChannelIdsEnd msg); + Result_NoneLightningErrorZ handle_query_channel_range(byte[] their_node_id, QueryChannelRange msg); + Result_NoneLightningErrorZ handle_query_short_channel_ids(byte[] their_node_id, QueryShortChannelIds msg); } - public RoutingMessageHandler(RoutingMessageHandlerInterface arg) { - this(new bindings.LDKRoutingMessageHandler() { + private static class LDKRoutingMessageHandlerHolder { RoutingMessageHandler held; } + public static RoutingMessageHandler new_impl(RoutingMessageHandlerInterface arg, MessageSendEventsProvider.MessageSendEventsProviderInterface MessageSendEventsProvider_impl) { + final LDKRoutingMessageHandlerHolder impl_holder = new LDKRoutingMessageHandlerHolder(); + impl_holder.held = new RoutingMessageHandler(new bindings.LDKRoutingMessageHandler() { @Override public long handle_node_announcement(long msg) { NodeAnnouncement msg_hu_conv = new NodeAnnouncement(null, msg); Result_boolLightningErrorZ ret = arg.handle_node_announcement(msg_hu_conv); long result = ret != null ? ret.ptr : 0; - ret.ptr = 0; return result; } @Override public long handle_channel_announcement(long msg) { ChannelAnnouncement msg_hu_conv = new ChannelAnnouncement(null, msg); Result_boolLightningErrorZ ret = arg.handle_channel_announcement(msg_hu_conv); long result = ret != null ? ret.ptr : 0; - ret.ptr = 0; return result; } @Override public long handle_channel_update(long msg) { ChannelUpdate msg_hu_conv = new ChannelUpdate(null, msg); Result_boolLightningErrorZ ret = arg.handle_channel_update(msg_hu_conv); long result = ret != null ? ret.ptr : 0; - ret.ptr = 0; return result; } @Override public void handle_htlc_fail_channel_update(long update) { @@ -57,26 +61,54 @@ public class RoutingMessageHandler extends CommonBase { } @Override public long[] get_next_channel_announcements(long starting_point, byte batch_amount) { ThreeTuple[] ret = arg.get_next_channel_announcements(starting_point, batch_amount); - long[] result = Arrays.stream(ret).mapToLong(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(); - /* TODO 2 ThreeTuple */ + long[] result = Arrays.stream(ret).mapToLong(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(); + /* TODO 2 ThreeTuple */; return result; } @Override public long[] get_next_node_announcements(byte[] starting_point, byte batch_amount) { NodeAnnouncement[] ret = arg.get_next_node_announcements(starting_point, batch_amount); - long[] result = Arrays.stream(ret).mapToLong(arr_conv_18 -> arr_conv_18 == null ? 0 : arr_conv_18.ptr & ~1).toArray(); - /* TODO 2 NodeAnnouncement */ + long[] result = Arrays.stream(ret).mapToLong(ret_conv_18 -> ret_conv_18 == null ? 0 : ret_conv_18.ptr & ~1).toArray(); + /* TODO 2 NodeAnnouncement */; return result; } - @Override public boolean should_request_full_sync(byte[] node_id) { - boolean ret = arg.should_request_full_sync(node_id); - return ret; + @Override public void sync_routing_table(byte[] their_node_id, long init) { + Init init_hu_conv = new Init(null, init); + arg.sync_routing_table(their_node_id, init_hu_conv); } - }); + @Override public long handle_reply_channel_range(byte[] their_node_id, long msg) { + ReplyChannelRange msg_hu_conv = 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); + long result = ret != null ? ret.ptr : 0; + return result; + } + @Override public long handle_reply_short_channel_ids_end(byte[] their_node_id, long msg) { + ReplyShortChannelIdsEnd msg_hu_conv = 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); + long result = ret != null ? ret.ptr : 0; + return result; + } + @Override public long handle_query_channel_range(byte[] their_node_id, long msg) { + QueryChannelRange msg_hu_conv = 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); + long result = ret != null ? ret.ptr : 0; + return result; + } + @Override public long handle_query_short_channel_ids(byte[] their_node_id, long msg) { + QueryShortChannelIds msg_hu_conv = 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); + long result = ret != null ? ret.ptr : 0; + return result; + } + }, MessageSendEventsProvider.new_impl(MessageSendEventsProvider_impl).bindings_instance); + return impl_holder.held; } public Result_boolLightningErrorZ handle_node_announcement(NodeAnnouncement msg) { long ret = bindings.RoutingMessageHandler_handle_node_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1); Result_boolLightningErrorZ ret_hu_conv = Result_boolLightningErrorZ.constr_from_ptr(ret); - ret_hu_conv.ptrs_to.add(this); this.ptrs_to.add(msg); return ret_hu_conv; } @@ -84,7 +116,6 @@ public class RoutingMessageHandler extends CommonBase { public Result_boolLightningErrorZ handle_channel_announcement(ChannelAnnouncement msg) { long ret = bindings.RoutingMessageHandler_handle_channel_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1); Result_boolLightningErrorZ ret_hu_conv = Result_boolLightningErrorZ.constr_from_ptr(ret); - ret_hu_conv.ptrs_to.add(this); this.ptrs_to.add(msg); return ret_hu_conv; } @@ -92,7 +123,6 @@ public class RoutingMessageHandler extends CommonBase { public Result_boolLightningErrorZ handle_channel_update(ChannelUpdate msg) { long ret = bindings.RoutingMessageHandler_handle_channel_update(this.ptr, msg == null ? 0 : msg.ptr & ~1); Result_boolLightningErrorZ ret_hu_conv = Result_boolLightningErrorZ.constr_from_ptr(ret); - ret_hu_conv.ptrs_to.add(this); this.ptrs_to.add(msg); return ret_hu_conv; } @@ -104,35 +134,72 @@ public class RoutingMessageHandler extends CommonBase { public ThreeTuple[] get_next_channel_announcements(long starting_point, byte batch_amount) { long[] ret = bindings.RoutingMessageHandler_get_next_channel_announcements(this.ptr, starting_point, batch_amount); - ThreeTuple[] arr_conv_63_arr = new ThreeTuple[ret.length]; + ThreeTuple[] ret_conv_63_arr = new ThreeTuple[ret.length]; for (int l = 0; l < ret.length; l++) { - long arr_conv_63 = ret[l]; - long arr_conv_63_a = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(arr_conv_63); - ChannelAnnouncement arr_conv_63_a_hu_conv = new ChannelAnnouncement(null, arr_conv_63_a);; - long arr_conv_63_b = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(arr_conv_63); - ChannelUpdate arr_conv_63_b_hu_conv = new ChannelUpdate(null, arr_conv_63_b);; - long arr_conv_63_c = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(arr_conv_63); - ChannelUpdate arr_conv_63_c_hu_conv = new ChannelUpdate(null, arr_conv_63_c);; - ThreeTuple arr_conv_63_conv = new ThreeTuple(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; + long ret_conv_63 = ret[l]; + long ret_conv_63_a = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(ret_conv_63); + ChannelAnnouncement ret_conv_63_a_hu_conv = new ChannelAnnouncement(null, ret_conv_63_a); + ret_conv_63_a_hu_conv.ptrs_to.add(this);; + long ret_conv_63_b = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(ret_conv_63); + ChannelUpdate ret_conv_63_b_hu_conv = new ChannelUpdate(null, ret_conv_63_b); + ret_conv_63_b_hu_conv.ptrs_to.add(this);; + long ret_conv_63_c = bindings.LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(ret_conv_63); + ChannelUpdate ret_conv_63_c_hu_conv = 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; } - return arr_conv_63_arr; + return ret_conv_63_arr; } public NodeAnnouncement[] get_next_node_announcements(byte[] starting_point, byte batch_amount) { long[] 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++) { - long arr_conv_18 = ret[s]; - NodeAnnouncement arr_conv_18_hu_conv = new NodeAnnouncement(null, arr_conv_18); - arr_conv_18_arr[s] = arr_conv_18_hu_conv; + long ret_conv_18 = ret[s]; + NodeAnnouncement ret_conv_18_hu_conv = 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(byte[] their_node_id, Init init) { + bindings.RoutingMessageHandler_sync_routing_table(this.ptr, their_node_id, init == null ? 0 : init.ptr & ~1); + this.ptrs_to.add(init); } - public boolean should_request_full_sync(byte[] node_id) { - boolean ret = bindings.RoutingMessageHandler_should_request_full_sync(this.ptr, node_id); - return ret; + public Result_NoneLightningErrorZ handle_reply_channel_range(byte[] their_node_id, ReplyChannelRange msg) { + long ret = bindings.RoutingMessageHandler_handle_reply_channel_range(this.ptr, their_node_id, 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(byte[] their_node_id, ReplyShortChannelIdsEnd msg) { + long ret = bindings.RoutingMessageHandler_handle_reply_short_channel_ids_end(this.ptr, their_node_id, 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(byte[] their_node_id, QueryChannelRange msg) { + long ret = bindings.RoutingMessageHandler_handle_query_channel_range(this.ptr, their_node_id, 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(byte[] their_node_id, QueryShortChannelIds msg) { + long ret = bindings.RoutingMessageHandler_handle_query_short_channel_ids(this.ptr, their_node_id, 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; } }