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

diff --git a/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java b/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
index 196cb479..4a604c50 100644
--- a/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
+++ b/src/main/java/org/ldk/structs/HTLCOutputInCommitment.java
@@ -110,7 +110,7 @@ public class HTLCOutputInCommitment extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Option_u32Z ret_hu_conv = org.ldk.structs.Option_u32Z.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -119,16 +119,17 @@ 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) {
+	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);
@@ -137,7 +138,8 @@ public class HTLCOutputInCommitment extends CommonBase {
 		Reference.reachabilityFence(transaction_output_index_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.HTLCOutputInCommitment ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.HTLCOutputInCommitment(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		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;
 	}
 
@@ -155,10 +157,27 @@ public class HTLCOutputInCommitment extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.HTLCOutputInCommitment ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.HTLCOutputInCommitment(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		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
 	 */