X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHop.java;h=46b749c1714623c3f172a60c3f2db450ac134080;hb=8aa8a96fc6d8fcdd3fbb419b4b4c12482af14938;hp=9434554027f4999b3238d75657ba080bd8604953;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RouteHop.java b/src/main/java/org/ldk/structs/RouteHop.java
index 94345540..46b749c1 100644
--- a/src/main/java/org/ldk/structs/RouteHop.java
+++ b/src/main/java/org/ldk/structs/RouteHop.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;
 
 
@@ -24,6 +25,7 @@ public class RouteHop extends CommonBase {
 	 */
 	public byte[] get_pubkey() {
 		byte[] ret = bindings.RouteHop_get_pubkey(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -31,7 +33,9 @@ public class RouteHop extends CommonBase {
 	 * The node_id of the node at this hop.
 	 */
 	public void set_pubkey(byte[] val) {
-		bindings.RouteHop_set_pubkey(this.ptr, val);
+		bindings.RouteHop_set_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -40,9 +44,10 @@ public class RouteHop extends CommonBase {
 	 */
 	public NodeFeatures get_node_features() {
 		long ret = bindings.RouteHop_get_node_features(this.ptr);
-		if (ret < 1024) { return null; }
-		NodeFeatures ret_hu_conv = new NodeFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -50,9 +55,11 @@ public class RouteHop extends CommonBase {
 	 * The node_announcement features of the node at this hop. For the last hop, these may be
 	 * amended to match the features present in the invoice this node generated.
 	 */
-	public void set_node_features(NodeFeatures val) {
-		bindings.RouteHop_set_node_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
+	public void set_node_features(org.ldk.structs.NodeFeatures val) {
+		bindings.RouteHop_set_node_features(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -60,6 +67,7 @@ public class RouteHop extends CommonBase {
 	 */
 	public long get_short_channel_id() {
 		long ret = bindings.RouteHop_get_short_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -68,6 +76,8 @@ public class RouteHop extends CommonBase {
 	 */
 	public void set_short_channel_id(long val) {
 		bindings.RouteHop_set_short_channel_id(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -76,9 +86,10 @@ public class RouteHop extends CommonBase {
 	 */
 	public ChannelFeatures get_channel_features() {
 		long ret = bindings.RouteHop_get_channel_features(this.ptr);
-		if (ret < 1024) { return null; }
-		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelFeatures(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -86,9 +97,11 @@ public class RouteHop extends CommonBase {
 	 * The channel_announcement features of the channel that should be used from the previous hop
 	 * to reach this node.
 	 */
-	public void set_channel_features(ChannelFeatures val) {
-		bindings.RouteHop_set_channel_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
+	public void set_channel_features(org.ldk.structs.ChannelFeatures val) {
+		bindings.RouteHop_set_channel_features(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
@@ -98,6 +111,7 @@ public class RouteHop extends CommonBase {
 	 */
 	public long get_fee_msat() {
 		long ret = bindings.RouteHop_get_fee_msat(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -108,6 +122,8 @@ public class RouteHop extends CommonBase {
 	 */
 	public void set_fee_msat(long val) {
 		bindings.RouteHop_set_fee_msat(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -116,6 +132,7 @@ public class RouteHop extends CommonBase {
 	 */
 	public int get_cltv_expiry_delta() {
 		int ret = bindings.RouteHop_get_cltv_expiry_delta(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -125,37 +142,82 @@ public class RouteHop extends CommonBase {
 	 */
 	public void set_cltv_expiry_delta(int val) {
 		bindings.RouteHop_set_cltv_expiry_delta(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
 	 * Constructs a new RouteHop given each field
 	 */
-	public static RouteHop of(byte[] pubkey_arg, NodeFeatures node_features_arg, long short_channel_id_arg, ChannelFeatures channel_features_arg, long fee_msat_arg, int cltv_expiry_delta_arg) {
-		long ret = bindings.RouteHop_new(pubkey_arg, node_features_arg == null ? 0 : node_features_arg.ptr & ~1, short_channel_id_arg, channel_features_arg == null ? 0 : channel_features_arg.ptr & ~1, fee_msat_arg, cltv_expiry_delta_arg);
-		if (ret < 1024) { return null; }
-		RouteHop ret_hu_conv = new RouteHop(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(node_features_arg);
-		ret_hu_conv.ptrs_to.add(channel_features_arg);
+	public static RouteHop of(byte[] pubkey_arg, org.ldk.structs.NodeFeatures node_features_arg, long short_channel_id_arg, org.ldk.structs.ChannelFeatures channel_features_arg, long fee_msat_arg, int cltv_expiry_delta_arg) {
+		long ret = bindings.RouteHop_new(InternalUtils.check_arr_len(pubkey_arg, 33), node_features_arg == null ? 0 : node_features_arg.ptr, short_channel_id_arg, channel_features_arg == null ? 0 : channel_features_arg.ptr, fee_msat_arg, cltv_expiry_delta_arg);
+		Reference.reachabilityFence(pubkey_arg);
+		Reference.reachabilityFence(node_features_arg);
+		Reference.reachabilityFence(short_channel_id_arg);
+		Reference.reachabilityFence(channel_features_arg);
+		Reference.reachabilityFence(fee_msat_arg);
+		Reference.reachabilityFence(cltv_expiry_delta_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.RouteHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RouteHop(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(node_features_arg); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_features_arg); };
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.RouteHop_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the RouteHop
 	 */
 	public RouteHop clone() {
 		long ret = bindings.RouteHop_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		RouteHop ret_hu_conv = new RouteHop(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.RouteHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RouteHop(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Checks if two RouteHops contain equal inner contents.
+	 */
+	public long hash() {
+		long ret = bindings.RouteHop_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
+	/**
+	 * Checks if two RouteHops 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.RouteHop b) {
+		boolean ret = bindings.RouteHop_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 RouteHop)) return false;
+		return this.eq((RouteHop)o);
+	}
 	/**
 	 * Serialize the RouteHop object into a byte array which can be read by RouteHop_read
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.RouteHop_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -164,7 +226,8 @@ public class RouteHop extends CommonBase {
 	 */
 	public static Result_RouteHopDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.RouteHop_read(ser);
-		if (ret < 1024) { return null; }
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_RouteHopDecodeErrorZ ret_hu_conv = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}