X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHop.java;h=f2168f4b711a0c59b8802e4addc4f68414177111;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=2c301f7d2d63894ad29c7e028c21f1923102520c;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RouteHop.java b/src/main/java/org/ldk/structs/RouteHop.java
index 2c301f7d..f2168f4b 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 javax.annotation.Nullable;
 
 
 /**
@@ -30,7 +31,7 @@ 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));
 	}
 
 	/**
@@ -39,7 +40,8 @@ public class RouteHop extends CommonBase {
 	 */
 	public NodeFeatures get_node_features() {
 		long ret = bindings.RouteHop_get_node_features(this.ptr);
-		NodeFeatures ret_hu_conv = new NodeFeatures(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeFeatures(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -50,7 +52,6 @@ public class RouteHop extends CommonBase {
 	 */
 	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);
 	}
 
 	/**
@@ -74,7 +75,8 @@ public class RouteHop extends CommonBase {
 	 */
 	public ChannelFeatures get_channel_features() {
 		long ret = bindings.RouteHop_get_channel_features(this.ptr);
-		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelFeatures(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -85,7 +87,6 @@ public class RouteHop extends CommonBase {
 	 */
 	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);
 	}
 
 	/**
@@ -127,23 +128,65 @@ public class RouteHop extends CommonBase {
 	/**
 	 * Constructs a new RouteHop given each field
 	 */
-	public static RouteHop constructor_new(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);
-		RouteHop ret_hu_conv = new RouteHop(null, ret);
+	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(InternalUtils.check_arr_len(pubkey_arg, 33), 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 >= 0 && ret <= 4096) { return null; }
+		RouteHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { 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);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.RouteHop_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the RouteHop
 	 */
 	public RouteHop clone() {
 		long ret = bindings.RouteHop_clone(this.ptr);
-		RouteHop ret_hu_conv = new RouteHop(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RouteHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RouteHop(null, ret); }
 		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);
+		return ret;
+	}
+
+	/**
+	 * 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(RouteHop b) {
+		boolean ret = bindings.RouteHop_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
+		this.ptrs_to.add(b);
+		return ret;
+	}
+
+	/**
+	 * 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);
+		return ret;
+	}
+
+	/**
+	 * Read a RouteHop from a byte array, created by RouteHop_write
+	 */
+	public static Result_RouteHopDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.RouteHop_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_RouteHopDecodeErrorZ ret_hu_conv = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
+	}
+
 }