X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FClosingSigned.java;h=a67baf21b158a3f0e371d6a17d95a15060d97cbd;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=a3af4acd4bbca90e646142200b0b27a3650cda37;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ClosingSigned.java b/src/main/java/org/ldk/structs/ClosingSigned.java index a3af4acd..a67baf21 100644 --- a/src/main/java/org/ldk/structs/ClosingSigned.java +++ b/src/main/java/org/ldk/structs/ClosingSigned.java @@ -31,7 +31,7 @@ public class ClosingSigned extends CommonBase { * The channel ID */ public void set_channel_id(byte[] val) { - bindings.ClosingSigned_set_channel_id(this.ptr, val); + bindings.ClosingSigned_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); } /** @@ -61,7 +61,7 @@ public class ClosingSigned extends CommonBase { * A signature on the closing transaction */ public void set_signature(byte[] val) { - bindings.ClosingSigned_set_signature(this.ptr, val); + bindings.ClosingSigned_set_signature(this.ptr, InternalUtils.check_arr_len(val, 64)); } /** @@ -73,8 +73,8 @@ public class ClosingSigned extends CommonBase { @Nullable public ClosingSignedFeeRange get_fee_range() { long ret = bindings.ClosingSigned_get_fee_range(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - ClosingSignedFeeRange ret_hu_conv = new ClosingSignedFeeRange(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + ClosingSignedFeeRange ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ClosingSignedFeeRange(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -93,20 +93,25 @@ public class ClosingSigned extends CommonBase { * Constructs a new ClosingSigned given each field */ public static ClosingSigned of(byte[] channel_id_arg, long fee_satoshis_arg, byte[] signature_arg, ClosingSignedFeeRange fee_range_arg) { - long ret = bindings.ClosingSigned_new(channel_id_arg, fee_satoshis_arg, signature_arg, fee_range_arg == null ? 0 : fee_range_arg.ptr & ~1); - if (ret >= 0 && ret < 1024) { return null; } - ClosingSigned ret_hu_conv = new ClosingSigned(null, ret); + long ret = bindings.ClosingSigned_new(InternalUtils.check_arr_len(channel_id_arg, 32), fee_satoshis_arg, InternalUtils.check_arr_len(signature_arg, 64), fee_range_arg == null ? 0 : fee_range_arg.ptr & ~1); + if (ret >= 0 && ret <= 4096) { return null; } + ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ClosingSigned(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.ClosingSigned_clone_ptr(this.ptr); + return ret; + } + /** * Creates a copy of the ClosingSigned */ public ClosingSigned clone() { long ret = bindings.ClosingSigned_clone(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - ClosingSigned ret_hu_conv = new ClosingSigned(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ClosingSigned(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -124,7 +129,7 @@ public class ClosingSigned extends CommonBase { */ public static Result_ClosingSignedDecodeErrorZ read(byte[] ser) { long ret = bindings.ClosingSigned_read(ser); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_ClosingSignedDecodeErrorZ ret_hu_conv = Result_ClosingSignedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }