X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FHTLCOutputInCommitment.java;h=4a604c5041c1393231b192d49b6e4bc82a0a7acf;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=55f2cb22660b110e45e1046c135075223d56e865;hpb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java b/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
index 55f2cb22..4a604c50 100644
--- a/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
+++ b/src/main/java/org/ldk/structs/HTLCOutputInCommitment.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 HTLCOutputInCommitment extends CommonBase {
 	 */
 	public boolean get_offered() {
 		boolean ret = bindings.HTLCOutputInCommitment_get_offered(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -38,6 +40,8 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public void set_offered(boolean val) {
 		bindings.HTLCOutputInCommitment_set_offered(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -46,6 +50,7 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public long get_amount_msat() {
 		long ret = bindings.HTLCOutputInCommitment_get_amount_msat(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -55,6 +60,8 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public void set_amount_msat(long val) {
 		bindings.HTLCOutputInCommitment_set_amount_msat(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -62,6 +69,7 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public int get_cltv_expiry() {
 		int ret = bindings.HTLCOutputInCommitment_get_cltv_expiry(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -70,6 +78,8 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public void set_cltv_expiry(int val) {
 		bindings.HTLCOutputInCommitment_set_cltv_expiry(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -77,6 +87,7 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public byte[] get_payment_hash() {
 		byte[] ret = bindings.HTLCOutputInCommitment_get_payment_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -84,7 +95,9 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 * The hash of the preimage which unlocks this HTLC.
 	 */
 	public void set_payment_hash(byte[] val) {
-		bindings.HTLCOutputInCommitment_set_payment_hash(this.ptr, val);
+		bindings.HTLCOutputInCommitment_set_payment_hash(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -94,9 +107,10 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public Option_u32Z get_transaction_output_index() {
 		long ret = bindings.HTLCOutputInCommitment_get_transaction_output_index(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		Option_u32Z ret_hu_conv = Option_u32Z.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.Option_u32Z ret_hu_conv = org.ldk.structs.Option_u32Z.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -105,37 +119,71 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 * below the dust limit (in which case no output appears in the commitment transaction and the
 	 * value is spent to additional transaction fees).
 	 */
-	public void set_transaction_output_index(Option_u32Z val) {
+	public void set_transaction_output_index(org.ldk.structs.Option_u32Z val) {
 		bindings.HTLCOutputInCommitment_set_transaction_output_index(this.ptr, val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * Constructs a new HTLCOutputInCommitment given each field
 	 */
-	public static HTLCOutputInCommitment of(boolean offered_arg, long amount_msat_arg, int cltv_expiry_arg, byte[] payment_hash_arg, Option_u32Z transaction_output_index_arg) {
-		long ret = bindings.HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, payment_hash_arg, transaction_output_index_arg.ptr);
+	public static HTLCOutputInCommitment of(boolean offered_arg, long amount_msat_arg, int cltv_expiry_arg, byte[] payment_hash_arg, org.ldk.structs.Option_u32Z transaction_output_index_arg) {
+		long ret = bindings.HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, InternalUtils.check_arr_len(payment_hash_arg, 32), transaction_output_index_arg.ptr);
+		Reference.reachabilityFence(offered_arg);
+		Reference.reachabilityFence(amount_msat_arg);
+		Reference.reachabilityFence(cltv_expiry_arg);
+		Reference.reachabilityFence(payment_hash_arg);
+		Reference.reachabilityFence(transaction_output_index_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		HTLCOutputInCommitment ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new HTLCOutputInCommitment(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.HTLCOutputInCommitment ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.HTLCOutputInCommitment(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(transaction_output_index_arg); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.HTLCOutputInCommitment_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the HTLCOutputInCommitment
 	 */
 	public HTLCOutputInCommitment clone() {
 		long ret = bindings.HTLCOutputInCommitment_clone(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		HTLCOutputInCommitment ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new HTLCOutputInCommitment(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.HTLCOutputInCommitment ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.HTLCOutputInCommitment(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Checks if two HTLCOutputInCommitments 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(org.ldk.structs.HTLCOutputInCommitment b) {
+		boolean ret = bindings.HTLCOutputInCommitment_eq(this.ptr, 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 HTLCOutputInCommitment)) return false;
+		return this.eq((HTLCOutputInCommitment)o);
+	}
 	/**
 	 * Serialize the HTLCOutputInCommitment object into a byte array which can be read by HTLCOutputInCommitment_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.HTLCOutputInCommitment_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -144,6 +192,7 @@ public class HTLCOutputInCommitment extends CommonBase {
 	 */
 	public static Result_HTLCOutputInCommitmentDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.HTLCOutputInCommitment_read(ser);
+		Reference.reachabilityFence(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_HTLCOutputInCommitmentDecodeErrorZ ret_hu_conv = Result_HTLCOutputInCommitmentDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;