X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOutPoint.java;h=22125dd3713ac733360388997487bfe7ff6b544f;hb=7b75443b8305c6a24d3c08520e1785e9d39960e4;hp=a181f35f2bed37b54ca9d0b051fa36646930472b;hpb=f3e670e9341decac613d33fc52febf19cea32f20;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/OutPoint.java b/src/main/java/org/ldk/structs/OutPoint.java
index a181f35f..22125dd3 100644
--- a/src/main/java/org/ldk/structs/OutPoint.java
+++ b/src/main/java/org/ldk/structs/OutPoint.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 OutPoint extends CommonBase {
 	 */
 	public byte[] get_txid() {
 		byte[] ret = bindings.OutPoint_get_txid(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -35,6 +37,8 @@ public class OutPoint extends CommonBase {
 	 */
 	public void set_txid(byte[] val) {
 		bindings.OutPoint_set_txid(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -42,6 +46,7 @@ public class OutPoint extends CommonBase {
 	 */
 	public short get_index() {
 		short ret = bindings.OutPoint_get_index(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -50,6 +55,8 @@ public class OutPoint extends CommonBase {
 	 */
 	public void set_index(short val) {
 		bindings.OutPoint_set_index(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -57,14 +64,17 @@ public class OutPoint extends CommonBase {
 	 */
 	public static OutPoint of(byte[] txid_arg, short index_arg) {
 		long ret = bindings.OutPoint_new(InternalUtils.check_arr_len(txid_arg, 32), index_arg);
+		Reference.reachabilityFence(txid_arg);
+		Reference.reachabilityFence(index_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new OutPoint(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OutPoint(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.OutPoint_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -73,9 +83,10 @@ public class OutPoint extends CommonBase {
 	 */
 	public OutPoint clone() {
 		long ret = bindings.OutPoint_clone(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new OutPoint(null, ret); }
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.OutPoint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OutPoint(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -84,25 +95,36 @@ public class OutPoint extends CommonBase {
 	 * 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(OutPoint b) {
-		boolean ret = bindings.OutPoint_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
-		this.ptrs_to.add(b);
+	public boolean eq(org.ldk.structs.OutPoint b) {
+		boolean ret = bindings.OutPoint_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 OutPoint)) return false;
+		return this.eq((OutPoint)o);
+	}
 	/**
-	 * Checks if two OutPoints contain equal inner contents.
+	 * Generates a non-cryptographic 64-bit hash of the OutPoint.
 	 */
 	public long hash() {
 		long ret = bindings.OutPoint_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Convert an `OutPoint` to a lightning channel id.
 	 */
 	public byte[] to_channel_id() {
 		byte[] ret = bindings.OutPoint_to_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -111,6 +133,7 @@ public class OutPoint extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.OutPoint_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -119,6 +142,7 @@ public class OutPoint extends CommonBase {
 	 */
 	public static Result_OutPointDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.OutPoint_read(ser);
+		Reference.reachabilityFence(ser);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_OutPointDecodeErrorZ ret_hu_conv = Result_OutPointDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;