X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNetworkGraph.java;h=1c2469d4db487ae0bbf67a081a73db4b6e96773d;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=0c3c3c3806c2729e4e10750b4eeae2c09418297a;hpb=e6173a79ce766cef7a660f22fc8fd1220975f6ea;p=ldk-java diff --git a/src/main/java/org/ldk/structs/NetworkGraph.java b/src/main/java/org/ldk/structs/NetworkGraph.java index 0c3c3c38..1c2469d4 100644 --- a/src/main/java/org/ldk/structs/NetworkGraph.java +++ b/src/main/java/org/ldk/structs/NetworkGraph.java @@ -19,13 +19,18 @@ public class NetworkGraph extends CommonBase { if (ptr != 0) { bindings.NetworkGraph_free(ptr); } } + long clone_ptr() { + long ret = bindings.NetworkGraph_clone_ptr(this.ptr); + return ret; + } + /** * Creates a copy of the NetworkGraph */ public NetworkGraph clone() { long ret = bindings.NetworkGraph_clone(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - NetworkGraph ret_hu_conv = new NetworkGraph(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + NetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetworkGraph(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -43,7 +48,7 @@ public class NetworkGraph extends CommonBase { */ public static Result_NetworkGraphDecodeErrorZ read(byte[] ser) { long ret = bindings.NetworkGraph_read(ser); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_NetworkGraphDecodeErrorZ ret_hu_conv = Result_NetworkGraphDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -52,9 +57,9 @@ public class NetworkGraph extends CommonBase { * Creates a new, empty, network graph. */ public static NetworkGraph of(byte[] genesis_hash) { - long ret = bindings.NetworkGraph_new(genesis_hash); - if (ret >= 0 && ret < 1024) { return null; } - NetworkGraph ret_hu_conv = new NetworkGraph(null, ret); + long ret = bindings.NetworkGraph_new(InternalUtils.check_arr_len(genesis_hash, 32)); + if (ret >= 0 && ret <= 4096) { return null; } + NetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetworkGraph(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } @@ -64,8 +69,8 @@ public class NetworkGraph extends CommonBase { */ public ReadOnlyNetworkGraph read_only() { long ret = bindings.NetworkGraph_read_only(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - ReadOnlyNetworkGraph ret_hu_conv = new ReadOnlyNetworkGraph(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + ReadOnlyNetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ReadOnlyNetworkGraph(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -80,7 +85,7 @@ public class NetworkGraph extends CommonBase { */ public Result_NoneLightningErrorZ update_node_from_announcement(NodeAnnouncement msg) { long ret = bindings.NetworkGraph_update_node_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); this.ptrs_to.add(msg); return ret_hu_conv; @@ -94,7 +99,7 @@ public class NetworkGraph extends CommonBase { */ public Result_NoneLightningErrorZ update_node_from_unsigned_announcement(UnsignedNodeAnnouncement msg) { long ret = bindings.NetworkGraph_update_node_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); this.ptrs_to.add(msg); return ret_hu_conv; @@ -112,9 +117,10 @@ public class NetworkGraph extends CommonBase { */ public Result_NoneLightningErrorZ update_channel_from_announcement(ChannelAnnouncement msg, Option_AccessZ chain_access) { long ret = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access.ptr); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); this.ptrs_to.add(msg); + this.ptrs_to.add(chain_access); return ret_hu_conv; } @@ -128,9 +134,10 @@ public class NetworkGraph extends CommonBase { */ public Result_NoneLightningErrorZ update_channel_from_unsigned_announcement(UnsignedChannelAnnouncement msg, Option_AccessZ chain_access) { long ret = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access.ptr); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); this.ptrs_to.add(msg); + this.ptrs_to.add(chain_access); return ret_hu_conv; } @@ -148,7 +155,7 @@ public class NetworkGraph extends CommonBase { * Marks a node in the graph as failed. */ public void fail_node(byte[] _node_id, boolean is_permanent) { - bindings.NetworkGraph_fail_node(this.ptr, _node_id, is_permanent); + bindings.NetworkGraph_fail_node(this.ptr, InternalUtils.check_arr_len(_node_id, 33), is_permanent); } /** @@ -161,7 +168,7 @@ public class NetworkGraph extends CommonBase { */ public Result_NoneLightningErrorZ update_channel(ChannelUpdate msg) { long ret = bindings.NetworkGraph_update_channel(this.ptr, msg == null ? 0 : msg.ptr & ~1); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); this.ptrs_to.add(msg); return ret_hu_conv; @@ -174,7 +181,7 @@ public class NetworkGraph extends CommonBase { */ public Result_NoneLightningErrorZ update_channel_unsigned(UnsignedChannelUpdate msg) { long ret = bindings.NetworkGraph_update_channel_unsigned(this.ptr, msg == null ? 0 : msg.ptr & ~1); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret); this.ptrs_to.add(msg); return ret_hu_conv;