X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FClosingSignedFeeRange.java;h=5c238244c2291c41b8748a4b303a511db9cae916;hb=300b54d26fe5ed89f472ef821ebf67d56c917e49;hp=04b5d8c7bc7eba567f0304f9b1865215a6c08688;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ClosingSignedFeeRange.java b/src/main/java/org/ldk/structs/ClosingSignedFeeRange.java index 04b5d8c7..5c238244 100644 --- a/src/main/java/org/ldk/structs/ClosingSignedFeeRange.java +++ b/src/main/java/org/ldk/structs/ClosingSignedFeeRange.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; @@ -27,6 +28,7 @@ public class ClosingSignedFeeRange extends CommonBase { */ public long get_min_fee_satoshis() { long ret = bindings.ClosingSignedFeeRange_get_min_fee_satoshis(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -36,6 +38,8 @@ public class ClosingSignedFeeRange extends CommonBase { */ public void set_min_fee_satoshis(long val) { bindings.ClosingSignedFeeRange_set_min_fee_satoshis(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -44,6 +48,7 @@ public class ClosingSignedFeeRange extends CommonBase { */ public long get_max_fee_satoshis() { long ret = bindings.ClosingSignedFeeRange_get_max_fee_satoshis(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -53,6 +58,8 @@ public class ClosingSignedFeeRange extends CommonBase { */ public void set_max_fee_satoshis(long val) { bindings.ClosingSignedFeeRange_set_max_fee_satoshis(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -60,28 +67,55 @@ public class ClosingSignedFeeRange extends CommonBase { */ public static ClosingSignedFeeRange of(long min_fee_satoshis_arg, long max_fee_satoshis_arg) { long ret = bindings.ClosingSignedFeeRange_new(min_fee_satoshis_arg, max_fee_satoshis_arg); - if (ret >= 0 && ret < 1024) { return null; } - ClosingSignedFeeRange ret_hu_conv = new ClosingSignedFeeRange(null, ret); - ret_hu_conv.ptrs_to.add(ret_hu_conv); + Reference.reachabilityFence(min_fee_satoshis_arg); + Reference.reachabilityFence(max_fee_satoshis_arg); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ClosingSignedFeeRange ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ClosingSignedFeeRange(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.ClosingSignedFeeRange_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Creates a copy of the ClosingSignedFeeRange */ public ClosingSignedFeeRange clone() { long ret = bindings.ClosingSignedFeeRange_clone(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } - ClosingSignedFeeRange ret_hu_conv = new ClosingSignedFeeRange(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.ClosingSignedFeeRange ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ClosingSignedFeeRange(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } + /** + * Checks if two ClosingSignedFeeRanges 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(ClosingSignedFeeRange b) { + boolean ret = bindings.ClosingSignedFeeRange_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 ClosingSignedFeeRange)) return false; + return this.eq((ClosingSignedFeeRange)o); + } /** * Serialize the ClosingSignedFeeRange object into a byte array which can be read by ClosingSignedFeeRange_read */ public byte[] write() { byte[] ret = bindings.ClosingSignedFeeRange_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -90,7 +124,8 @@ public class ClosingSignedFeeRange extends CommonBase { */ public static Result_ClosingSignedFeeRangeDecodeErrorZ read(byte[] ser) { long ret = bindings.ClosingSignedFeeRange_read(ser); - if (ret >= 0 && ret < 1024) { return null; } + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_ClosingSignedFeeRangeDecodeErrorZ ret_hu_conv = Result_ClosingSignedFeeRangeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }