X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUpdateAddHTLC.java;h=d827577112b28413e886c404ef5355402ba4649a;hb=5e9de82b3a7712a41189756d9d16d946142b2ac5;hp=fd3b2aca6be8e3c1d37b805fa1f5ba413de2a75f;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java diff --git a/src/main/java/org/ldk/structs/UpdateAddHTLC.java b/src/main/java/org/ldk/structs/UpdateAddHTLC.java index fd3b2aca..d8275771 100644 --- a/src/main/java/org/ldk/structs/UpdateAddHTLC.java +++ b/src/main/java/org/ldk/structs/UpdateAddHTLC.java @@ -4,6 +4,8 @@ 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; /** @@ -23,6 +25,7 @@ public class UpdateAddHTLC extends CommonBase { */ public byte[] get_channel_id() { byte[] ret = bindings.UpdateAddHTLC_get_channel_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -30,7 +33,9 @@ public class UpdateAddHTLC extends CommonBase { * The channel ID */ public void set_channel_id(byte[] val) { - bindings.UpdateAddHTLC_set_channel_id(this.ptr, val); + bindings.UpdateAddHTLC_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -38,6 +43,7 @@ public class UpdateAddHTLC extends CommonBase { */ public long get_htlc_id() { long ret = bindings.UpdateAddHTLC_get_htlc_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -46,6 +52,8 @@ public class UpdateAddHTLC extends CommonBase { */ public void set_htlc_id(long val) { bindings.UpdateAddHTLC_set_htlc_id(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -53,6 +61,7 @@ public class UpdateAddHTLC extends CommonBase { */ public long get_amount_msat() { long ret = bindings.UpdateAddHTLC_get_amount_msat(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -61,6 +70,8 @@ public class UpdateAddHTLC extends CommonBase { */ public void set_amount_msat(long val) { bindings.UpdateAddHTLC_set_amount_msat(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -68,6 +79,7 @@ public class UpdateAddHTLC extends CommonBase { */ public byte[] get_payment_hash() { byte[] ret = bindings.UpdateAddHTLC_get_payment_hash(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -75,7 +87,9 @@ public class UpdateAddHTLC extends CommonBase { * The payment hash, the pre-image of which controls HTLC redemption */ public void set_payment_hash(byte[] val) { - bindings.UpdateAddHTLC_set_payment_hash(this.ptr, val); + bindings.UpdateAddHTLC_set_payment_hash(this.ptr, InternalUtils.check_arr_len(val, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -83,6 +97,7 @@ public class UpdateAddHTLC extends CommonBase { */ public int get_cltv_expiry() { int ret = bindings.UpdateAddHTLC_get_cltv_expiry(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -91,6 +106,14 @@ public class UpdateAddHTLC extends CommonBase { */ public void set_cltv_expiry(int val) { bindings.UpdateAddHTLC_set_cltv_expiry(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + } + + long clone_ptr() { + long ret = bindings.UpdateAddHTLC_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; } /** @@ -98,24 +121,46 @@ public class UpdateAddHTLC extends CommonBase { */ public UpdateAddHTLC clone() { long ret = bindings.UpdateAddHTLC_clone(this.ptr); - UpdateAddHTLC ret_hu_conv = new UpdateAddHTLC(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.UpdateAddHTLC ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.UpdateAddHTLC(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } + /** + * Checks if two UpdateAddHTLCs 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(UpdateAddHTLC b) { + boolean ret = bindings.UpdateAddHTLC_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 UpdateAddHTLC)) return false; + return this.eq((UpdateAddHTLC)o); + } /** * Serialize the UpdateAddHTLC object into a byte array which can be read by UpdateAddHTLC_read */ public byte[] write() { byte[] ret = bindings.UpdateAddHTLC_write(this.ptr); + Reference.reachabilityFence(this); return ret; } /** * Read a UpdateAddHTLC from a byte array, created by UpdateAddHTLC_write */ - public static Result_UpdateAddHTLCDecodeErrorZ constructor_read(byte[] ser) { + public static Result_UpdateAddHTLCDecodeErrorZ read(byte[] ser) { long ret = bindings.UpdateAddHTLC_read(ser); + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_UpdateAddHTLCDecodeErrorZ ret_hu_conv = Result_UpdateAddHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }