X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHintHop.java;h=47f38b337fa7fee93927e81940aee19b06a7d1ca;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=ad4a93b8ee1c9dce9a2b369a54490c482fe8f211;hpb=b0c50b891cbca28d3bd1d86276c132ff5221d8e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RouteHintHop.java b/src/main/java/org/ldk/structs/RouteHintHop.java
index ad4a93b8..47f38b33 100644
--- a/src/main/java/org/ldk/structs/RouteHintHop.java
+++ b/src/main/java/org/ldk/structs/RouteHintHop.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 RouteHintHop extends CommonBase {
 	 * The node_id of the non-target end of the route
 	 */
 	public void set_src_node_id(byte[] val) {
-		bindings.RouteHintHop_set_src_node_id(this.ptr, val);
+		bindings.RouteHintHop_set_src_node_id(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
 	/**
@@ -53,7 +54,8 @@ public class RouteHintHop extends CommonBase {
 	 */
 	public RoutingFees get_fees() {
 		long ret = bindings.RouteHintHop_get_fees(this.ptr);
-		RoutingFees ret_hu_conv = new RoutingFees(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RoutingFees ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RoutingFees(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -63,7 +65,6 @@ public class RouteHintHop extends CommonBase {
 	 */
 	public void set_fees(RoutingFees val) {
 		bindings.RouteHintHop_set_fees(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -86,6 +87,7 @@ public class RouteHintHop extends CommonBase {
 	 */
 	public Option_u64Z get_htlc_minimum_msat() {
 		long ret = bindings.RouteHintHop_get_htlc_minimum_msat(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -103,6 +105,7 @@ public class RouteHintHop extends CommonBase {
 	 */
 	public Option_u64Z get_htlc_maximum_msat() {
 		long ret = bindings.RouteHintHop_get_htlc_maximum_msat(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -119,13 +122,37 @@ public class RouteHintHop extends CommonBase {
 	 * Constructs a new RouteHintHop given each field
 	 */
 	public static RouteHintHop of(byte[] src_node_id_arg, long short_channel_id_arg, RoutingFees fees_arg, short cltv_expiry_delta_arg, Option_u64Z htlc_minimum_msat_arg, Option_u64Z htlc_maximum_msat_arg) {
-		long ret = bindings.RouteHintHop_new(src_node_id_arg, short_channel_id_arg, fees_arg == null ? 0 : fees_arg.ptr & ~1, cltv_expiry_delta_arg, htlc_minimum_msat_arg.ptr, htlc_maximum_msat_arg.ptr);
-		RouteHintHop ret_hu_conv = new RouteHintHop(null, ret);
+		long ret = bindings.RouteHintHop_new(InternalUtils.check_arr_len(src_node_id_arg, 33), short_channel_id_arg, fees_arg == null ? 0 : fees_arg.ptr & ~1, cltv_expiry_delta_arg, htlc_minimum_msat_arg.ptr, htlc_maximum_msat_arg.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RouteHintHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RouteHintHop(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(fees_arg);
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.RouteHintHop_clone_ptr(this.ptr);
+		return ret;
+	}
+
+	/**
+	 * Creates a copy of the RouteHintHop
+	 */
+	public RouteHintHop clone() {
+		long ret = bindings.RouteHintHop_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RouteHintHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RouteHintHop(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Checks if two RouteHintHops contain equal inner contents.
+	 */
+	public long hash() {
+		long ret = bindings.RouteHintHop_hash(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Checks if two RouteHintHops contain equal inner contents.
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
@@ -138,12 +165,20 @@ public class RouteHintHop extends CommonBase {
 	}
 
 	/**
-	 * Creates a copy of the RouteHintHop
+	 * Serialize the RouteHintHop object into a byte array which can be read by RouteHintHop_read
 	 */
-	public RouteHintHop clone() {
-		long ret = bindings.RouteHintHop_clone(this.ptr);
-		RouteHintHop ret_hu_conv = new RouteHintHop(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+	public byte[] write() {
+		byte[] ret = bindings.RouteHintHop_write(this.ptr);
+		return ret;
+	}
+
+	/**
+	 * Read a RouteHintHop from a byte array, created by RouteHintHop_write
+	 */
+	public static Result_RouteHintHopDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.RouteHintHop_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_RouteHintHopDecodeErrorZ ret_hu_conv = Result_RouteHintHopDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}