X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FClosingSigned.java;h=e38d5987b370eb4fb599a6964c842b1a930d72fe;hb=07d5d868dfe064aadb28a7f7ca6002c16be9723d;hp=8f4823fc07579f44e9d7615ff9035557a7375c3c;hpb=d2925e24ac4643ec22eb73495f0424e27def2545;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ClosingSigned.java b/src/main/java/org/ldk/structs/ClosingSigned.java
index 8f4823fc..e38d5987 100644
--- a/src/main/java/org/ldk/structs/ClosingSigned.java
+++ b/src/main/java/org/ldk/structs/ClosingSigned.java
@@ -9,7 +9,9 @@ import javax.annotation.Nullable;
 
 
 /**
- * A closing_signed message to be sent or received from a peer
+ * A [`closing_signed`] message to be sent to or received from a peer.
+ * 
+ * [`closing_signed`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#closing-negotiation-closing_signed
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ClosingSigned extends CommonBase {
@@ -85,8 +87,8 @@ public class ClosingSigned extends CommonBase {
 		long ret = bindings.ClosingSigned_get_fee_range(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ClosingSignedFeeRange ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ClosingSignedFeeRange(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		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;
 	}
 
@@ -96,24 +98,28 @@ public class ClosingSigned extends CommonBase {
 	 * 
 	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_fee_range(@Nullable ClosingSignedFeeRange val) {
-		bindings.ClosingSigned_set_fee_range(this.ptr, val == null ? 0 : val.ptr & ~1);
+	public void set_fee_range(@Nullable org.ldk.structs.ClosingSignedFeeRange val) {
+		bindings.ClosingSigned_set_fee_range(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * Constructs a new ClosingSigned given each field
+	 * 
+	 * Note that fee_range_arg (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public static ClosingSigned of(byte[] channel_id_arg, long fee_satoshis_arg, byte[] signature_arg, ClosingSignedFeeRange fee_range_arg) {
-		long ret = bindings.ClosingSigned_new(InternalUtils.check_arr_len(channel_id_arg, 32), fee_satoshis_arg, InternalUtils.check_arr_len(signature_arg, 64), fee_range_arg == null ? 0 : fee_range_arg.ptr & ~1);
+	public static ClosingSigned of(byte[] channel_id_arg, long fee_satoshis_arg, byte[] signature_arg, @Nullable org.ldk.structs.ClosingSignedFeeRange fee_range_arg) {
+		long ret = bindings.ClosingSigned_new(InternalUtils.check_arr_len(channel_id_arg, 32), fee_satoshis_arg, InternalUtils.check_arr_len(signature_arg, 64), fee_range_arg == null ? 0 : fee_range_arg.ptr);
 		Reference.reachabilityFence(channel_id_arg);
 		Reference.reachabilityFence(fee_satoshis_arg);
 		Reference.reachabilityFence(signature_arg);
 		Reference.reachabilityFence(fee_range_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ClosingSigned(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ClosingSigned(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(fee_range_arg); };
 		return ret_hu_conv;
 	}
 
@@ -130,11 +136,28 @@ public class ClosingSigned extends CommonBase {
 		long ret = bindings.ClosingSigned_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ClosingSigned(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.ClosingSigned ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ClosingSigned(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Checks if two ClosingSigneds 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.ClosingSigned b) {
+		boolean ret = bindings.ClosingSigned_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 ClosingSigned)) return false;
+		return this.eq((ClosingSigned)o);
+	}
 	/**
 	 * Serialize the ClosingSigned object into a byte array which can be read by ClosingSigned_read
 	 */