X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FDataLossProtect.java;h=2b68a20a0cdc9c1a80cc3b7d969dcac97eca16d5;hb=5e9de82b3a7712a41189756d9d16d946142b2ac5;hp=3c625d07c7054bec59ae351df118c9908c2fa365;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java diff --git a/src/main/java/org/ldk/structs/DataLossProtect.java b/src/main/java/org/ldk/structs/DataLossProtect.java index 3c625d07..2b68a20a 100644 --- a/src/main/java/org/ldk/structs/DataLossProtect.java +++ b/src/main/java/org/ldk/structs/DataLossProtect.java @@ -4,6 +4,7 @@ import org.ldk.impl.bindings; import org.ldk.enums.*; import org.ldk.util.*; import java.util.Arrays; +import java.lang.ref.Reference; import javax.annotation.Nullable; @@ -28,6 +29,7 @@ public class DataLossProtect extends CommonBase { */ public byte[] get_your_last_per_commitment_secret() { byte[] ret = bindings.DataLossProtect_get_your_last_per_commitment_secret(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -36,7 +38,9 @@ public class DataLossProtect extends CommonBase { * belonging to the recipient */ public void set_your_last_per_commitment_secret(byte[] val) { - bindings.DataLossProtect_set_your_last_per_commitment_secret(this.ptr, val); + bindings.DataLossProtect_set_your_last_per_commitment_secret(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -44,6 +48,7 @@ public class DataLossProtect extends CommonBase { */ public byte[] get_my_current_per_commitment_point() { byte[] ret = bindings.DataLossProtect_get_my_current_per_commitment_point(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -51,29 +56,57 @@ public class DataLossProtect extends CommonBase { * The sender's per-commitment point for their current commitment transaction */ public void set_my_current_per_commitment_point(byte[] val) { - bindings.DataLossProtect_set_my_current_per_commitment_point(this.ptr, val); + bindings.DataLossProtect_set_my_current_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** * Constructs a new DataLossProtect given each field */ public static DataLossProtect of(byte[] your_last_per_commitment_secret_arg, byte[] my_current_per_commitment_point_arg) { - long ret = bindings.DataLossProtect_new(your_last_per_commitment_secret_arg, my_current_per_commitment_point_arg); - if (ret < 1024) { return null; } - DataLossProtect ret_hu_conv = new DataLossProtect(null, ret); - ret_hu_conv.ptrs_to.add(ret_hu_conv); + long ret = bindings.DataLossProtect_new(InternalUtils.check_arr_len(your_last_per_commitment_secret_arg, 32), InternalUtils.check_arr_len(my_current_per_commitment_point_arg, 33)); + Reference.reachabilityFence(your_last_per_commitment_secret_arg); + Reference.reachabilityFence(my_current_per_commitment_point_arg); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.DataLossProtect ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.DataLossProtect(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); }; return ret_hu_conv; } + long clone_ptr() { + long ret = bindings.DataLossProtect_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the DataLossProtect */ public DataLossProtect clone() { long ret = bindings.DataLossProtect_clone(this.ptr); - if (ret < 1024) { return null; } - DataLossProtect ret_hu_conv = new DataLossProtect(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.DataLossProtect ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.DataLossProtect(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } + /** + * Checks if two DataLossProtects contain equal inner contents. + * This ignores pointers and is_owned flags and looks at the values in fields. + * Two objects with NULL inner values will be considered "equal" here. + */ + public boolean eq(DataLossProtect b) { + boolean ret = bindings.DataLossProtect_eq(this.ptr, b == null ? 0 : b.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(b); + if (this != null) { this.ptrs_to.add(b); }; + return ret; + } + + @Override public boolean equals(Object o) { + if (!(o instanceof DataLossProtect)) return false; + return this.eq((DataLossProtect)o); + } }