X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRevokeAndACK.java;h=dc58cb4e36aa5d9e6bec005c64bac3118914a872;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=8737d5f2b4c1b7fe995d6bf38ed87fdb357c114e;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java diff --git a/src/main/java/org/ldk/structs/RevokeAndACK.java b/src/main/java/org/ldk/structs/RevokeAndACK.java index 8737d5f2..dc58cb4e 100644 --- a/src/main/java/org/ldk/structs/RevokeAndACK.java +++ b/src/main/java/org/ldk/structs/RevokeAndACK.java @@ -4,6 +4,7 @@ import org.ldk.impl.bindings; import org.ldk.enums.*; import org.ldk.util.*; import java.util.Arrays; +import javax.annotation.Nullable; /** @@ -30,7 +31,7 @@ public class RevokeAndACK extends CommonBase { * The channel ID */ public void set_channel_id(byte[] val) { - bindings.RevokeAndACK_set_channel_id(this.ptr, val); + bindings.RevokeAndACK_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); } /** @@ -45,7 +46,7 @@ public class RevokeAndACK extends CommonBase { * The secret corresponding to the per-commitment point */ public void set_per_commitment_secret(byte[] val) { - bindings.RevokeAndACK_set_per_commitment_secret(this.ptr, val); + bindings.RevokeAndACK_set_per_commitment_secret(this.ptr, InternalUtils.check_arr_len(val, 32)); } /** @@ -60,25 +61,32 @@ public class RevokeAndACK extends CommonBase { * The next sender-broadcast commitment transaction's per-commitment point */ public void set_next_per_commitment_point(byte[] val) { - bindings.RevokeAndACK_set_next_per_commitment_point(this.ptr, val); + bindings.RevokeAndACK_set_next_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33)); } /** * Constructs a new RevokeAndACK given each field */ - public static RevokeAndACK constructor_new(byte[] channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) { - long ret = bindings.RevokeAndACK_new(channel_id_arg, per_commitment_secret_arg, next_per_commitment_point_arg); - RevokeAndACK ret_hu_conv = new RevokeAndACK(null, ret); + public static RevokeAndACK of(byte[] channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) { + long ret = bindings.RevokeAndACK_new(InternalUtils.check_arr_len(channel_id_arg, 32), InternalUtils.check_arr_len(per_commitment_secret_arg, 32), InternalUtils.check_arr_len(next_per_commitment_point_arg, 33)); + if (ret >= 0 && ret <= 4096) { return null; } + RevokeAndACK ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RevokeAndACK(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.RevokeAndACK_clone_ptr(this.ptr); + return ret; + } + /** * Creates a copy of the RevokeAndACK */ public RevokeAndACK clone() { long ret = bindings.RevokeAndACK_clone(this.ptr); - RevokeAndACK ret_hu_conv = new RevokeAndACK(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + RevokeAndACK ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RevokeAndACK(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -94,8 +102,9 @@ public class RevokeAndACK extends CommonBase { /** * Read a RevokeAndACK from a byte array, created by RevokeAndACK_write */ - public static Result_RevokeAndACKDecodeErrorZ constructor_read(byte[] ser) { + public static Result_RevokeAndACKDecodeErrorZ read(byte[] ser) { long ret = bindings.RevokeAndACK_read(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_RevokeAndACKDecodeErrorZ ret_hu_conv = Result_RevokeAndACKDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }