X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNetGraphMsgHandler.java;h=4331c73f74877c79361636efe99614d7045a7975;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=90b342c0076b4d841e29ffb29bf3571d066b038b;hpb=f6c75b182a7786062a4966e8939701ef59092509;p=ldk-java diff --git a/src/main/java/org/ldk/structs/NetGraphMsgHandler.java b/src/main/java/org/ldk/structs/NetGraphMsgHandler.java index 90b342c0..4331c73f 100644 --- a/src/main/java/org/ldk/structs/NetGraphMsgHandler.java +++ b/src/main/java/org/ldk/structs/NetGraphMsgHandler.java @@ -32,31 +32,12 @@ public class NetGraphMsgHandler extends CommonBase { */ public EventHandler as_EventHandler() { long ret = bindings.NetGraphMsgHandler_as_EventHandler(this.ptr); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } EventHandler ret_hu_conv = new EventHandler(null, ret); ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } - /** - * Representation of the payment channel network - */ - public NetworkGraph get_network_graph() { - long ret = bindings.NetGraphMsgHandler_get_network_graph(this.ptr); - if (ret < 1024) { return null; } - NetworkGraph ret_hu_conv = new NetworkGraph(null, ret); - ret_hu_conv.ptrs_to.add(this); - return ret_hu_conv; - } - - /** - * Representation of the payment channel network - */ - public void set_network_graph(NetworkGraph val) { - bindings.NetGraphMsgHandler_set_network_graph(this.ptr, val == null ? 0 : val.ptr & ~1); - this.ptrs_to.add(val); - } - /** * Creates a new tracker of the actual state of the network of channels and nodes, * assuming an existing Network Graph. @@ -66,10 +47,11 @@ public class NetGraphMsgHandler extends CommonBase { */ public static NetGraphMsgHandler of(NetworkGraph network_graph, Option_AccessZ chain_access, Logger logger) { long ret = bindings.NetGraphMsgHandler_new(network_graph == null ? 0 : network_graph.ptr & ~1, chain_access.ptr, logger == null ? 0 : logger.ptr); - if (ret < 1024) { return null; } - NetGraphMsgHandler ret_hu_conv = new NetGraphMsgHandler(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + NetGraphMsgHandler ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetGraphMsgHandler(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); ret_hu_conv.ptrs_to.add(network_graph); + ret_hu_conv.ptrs_to.add(chain_access); ret_hu_conv.ptrs_to.add(logger); return ret_hu_conv; } @@ -81,6 +63,7 @@ public class NetGraphMsgHandler extends CommonBase { */ public void add_chain_access(Option_AccessZ chain_access) { bindings.NetGraphMsgHandler_add_chain_access(this.ptr, chain_access.ptr); + this.ptrs_to.add(chain_access); } /** @@ -89,7 +72,7 @@ public class NetGraphMsgHandler extends CommonBase { */ public RoutingMessageHandler as_RoutingMessageHandler() { long ret = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(this.ptr); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } RoutingMessageHandler ret_hu_conv = new RoutingMessageHandler(null, ret); ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; @@ -101,7 +84,7 @@ public class NetGraphMsgHandler extends CommonBase { */ public MessageSendEventsProvider as_MessageSendEventsProvider() { long ret = bindings.NetGraphMsgHandler_as_MessageSendEventsProvider(this.ptr); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } MessageSendEventsProvider ret_hu_conv = new MessageSendEventsProvider(null, ret); ret_hu_conv.ptrs_to.add(this); return ret_hu_conv;