X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelCounterparty.java;h=51de1b271fc7b9e3a5167e326cafd9406cfadce9;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=afbf447817e34dfd10ecb6691fc9c060127269ea;hpb=7d6be8a5ef72a4ebfe07660cce55f43f6cc30b80;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelCounterparty.java b/src/main/java/org/ldk/structs/ChannelCounterparty.java index afbf4478..51de1b27 100644 --- a/src/main/java/org/ldk/structs/ChannelCounterparty.java +++ b/src/main/java/org/ldk/structs/ChannelCounterparty.java @@ -32,7 +32,7 @@ public class ChannelCounterparty extends CommonBase { * The node_id of our counterparty */ public void set_node_id(byte[] val) { - bindings.ChannelCounterparty_set_node_id(this.ptr, val); + bindings.ChannelCounterparty_set_node_id(this.ptr, InternalUtils.check_arr_len(val, 33)); } /** @@ -42,8 +42,8 @@ public class ChannelCounterparty extends CommonBase { */ public InitFeatures get_features() { long ret = bindings.ChannelCounterparty_get_features(this.ptr); - if (ret < 1024) { return null; } - InitFeatures ret_hu_conv = new InitFeatures(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + InitFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new InitFeatures(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -55,7 +55,6 @@ public class ChannelCounterparty extends CommonBase { */ public void set_features(InitFeatures val) { bindings.ChannelCounterparty_set_features(this.ptr, val == null ? 0 : val.ptr & ~1); - this.ptrs_to.add(val); } /** @@ -94,8 +93,8 @@ public class ChannelCounterparty extends CommonBase { @Nullable public CounterpartyForwardingInfo get_forwarding_info() { long ret = bindings.ChannelCounterparty_get_forwarding_info(this.ptr); - if (ret < 1024) { return null; } - CounterpartyForwardingInfo ret_hu_conv = new CounterpartyForwardingInfo(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + CounterpartyForwardingInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new CounterpartyForwardingInfo(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -108,29 +107,31 @@ public class ChannelCounterparty extends CommonBase { */ public void set_forwarding_info(@Nullable CounterpartyForwardingInfo val) { bindings.ChannelCounterparty_set_forwarding_info(this.ptr, val == null ? 0 : val.ptr & ~1); - this.ptrs_to.add(val); } /** * Constructs a new ChannelCounterparty given each field */ public static ChannelCounterparty of(byte[] node_id_arg, InitFeatures features_arg, long unspendable_punishment_reserve_arg, CounterpartyForwardingInfo forwarding_info_arg) { - long ret = bindings.ChannelCounterparty_new(node_id_arg, features_arg == null ? 0 : features_arg.ptr & ~1, unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0 : forwarding_info_arg.ptr & ~1); - if (ret < 1024) { return null; } - ChannelCounterparty ret_hu_conv = new ChannelCounterparty(null, ret); + long ret = bindings.ChannelCounterparty_new(InternalUtils.check_arr_len(node_id_arg, 33), features_arg == null ? 0 : features_arg.ptr & ~1, unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0 : forwarding_info_arg.ptr & ~1); + if (ret >= 0 && ret <= 4096) { return null; } + ChannelCounterparty ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelCounterparty(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); - ret_hu_conv.ptrs_to.add(features_arg); - ret_hu_conv.ptrs_to.add(forwarding_info_arg); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.ChannelCounterparty_clone_ptr(this.ptr); + return ret; + } + /** * Creates a copy of the ChannelCounterparty */ public ChannelCounterparty clone() { long ret = bindings.ChannelCounterparty_clone(this.ptr); - if (ret < 1024) { return null; } - ChannelCounterparty ret_hu_conv = new ChannelCounterparty(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + ChannelCounterparty ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelCounterparty(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; }