X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHint.java;h=6ead7770d81545a718d7e7ee9f18693f81353af0;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=02c9758c9701c36b8775f0974b9828d4aa2ec6fb;hpb=c3ae2d6897e5a809459c8d9a72a4b3aa0052c8c8;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RouteHint.java b/src/main/java/org/ldk/structs/RouteHint.java
index 02c9758c..6ead7770 100644
--- a/src/main/java/org/ldk/structs/RouteHint.java
+++ b/src/main/java/org/ldk/structs/RouteHint.java
@@ -4,10 +4,11 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 
 /**
- * A channel descriptor which provides a last-hop route to get_route
+ * A list of hops along a payment path terminating with a channel to the recipient.
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class RouteHint extends CommonBase {
@@ -18,121 +19,83 @@ public class RouteHint extends CommonBase {
 		if (ptr != 0) { bindings.RouteHint_free(ptr); }
 	}
 
-	/**
-	 * The node_id of the non-target end of the route
-	 */
-	public byte[] get_src_node_id() {
-		byte[] ret = bindings.RouteHint_get_src_node_id(this.ptr);
-		return ret;
-	}
-
-	/**
-	 * The node_id of the non-target end of the route
-	 */
-	public void set_src_node_id(byte[] val) {
-		bindings.RouteHint_set_src_node_id(this.ptr, val);
+	public RouteHintHop[] get_a() {
+		long[] ret = bindings.RouteHint_get_a(this.ptr);
+		RouteHintHop[] ret_conv_14_arr = new RouteHintHop[ret.length];
+		for (int o = 0; o < ret.length; o++) {
+			long ret_conv_14 = ret[o];
+			RouteHintHop ret_conv_14_hu_conv = null; if (ret_conv_14 < 0 || ret_conv_14 > 4096) { ret_conv_14_hu_conv = new RouteHintHop(null, ret_conv_14); }
+			ret_conv_14_hu_conv.ptrs_to.add(this);
+			ret_conv_14_arr[o] = ret_conv_14_hu_conv;
+		}
+		return ret_conv_14_arr;
 	}
 
-	/**
-	 * The short_channel_id of this channel
-	 */
-	public long get_short_channel_id() {
-		long ret = bindings.RouteHint_get_short_channel_id(this.ptr);
-		return ret;
+	public void set_a(RouteHintHop[] val) {
+		bindings.RouteHint_set_a(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_14 -> val_conv_14 == null ? 0 : val_conv_14.ptr & ~1).toArray() : null);
 	}
 
 	/**
-	 * The short_channel_id of this channel
-	 */
-	public void set_short_channel_id(long val) {
-		bindings.RouteHint_set_short_channel_id(this.ptr, val);
-	}
-
-	/**
-	 * The fees which must be paid to use this channel
+	 * Constructs a new RouteHint given each field
 	 */
-	public RoutingFees get_fees() {
-		long ret = bindings.RouteHint_get_fees(this.ptr);
-		RoutingFees ret_hu_conv = new RoutingFees(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+	public static RouteHint of(RouteHintHop[] a_arg) {
+		long ret = bindings.RouteHint_new(a_arg != null ? Arrays.stream(a_arg).mapToLong(a_arg_conv_14 -> a_arg_conv_14 == null ? 0 : a_arg_conv_14.ptr & ~1).toArray() : null);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RouteHint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RouteHint(null, ret); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
 
-	/**
-	 * The fees which must be paid to use this channel
-	 */
-	public void set_fees(RoutingFees val) {
-		bindings.RouteHint_set_fees(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
-	}
-
-	/**
-	 * The difference in CLTV values between this node and the next node.
-	 */
-	public short get_cltv_expiry_delta() {
-		short ret = bindings.RouteHint_get_cltv_expiry_delta(this.ptr);
+	long clone_ptr() {
+		long ret = bindings.RouteHint_clone_ptr(this.ptr);
 		return ret;
 	}
 
 	/**
-	 * The difference in CLTV values between this node and the next node.
-	 */
-	public void set_cltv_expiry_delta(short val) {
-		bindings.RouteHint_set_cltv_expiry_delta(this.ptr, val);
-	}
-
-	/**
-	 * The minimum value, in msat, which must be relayed to the next hop.
+	 * Creates a copy of the RouteHint
 	 */
-	public Option_u64Z get_htlc_minimum_msat() {
-		long ret = bindings.RouteHint_get_htlc_minimum_msat(this.ptr);
-		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
+	public RouteHint clone() {
+		long ret = bindings.RouteHint_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RouteHint ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RouteHint(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
 	/**
-	 * The minimum value, in msat, which must be relayed to the next hop.
-	 */
-	public void set_htlc_minimum_msat(Option_u64Z val) {
-		bindings.RouteHint_set_htlc_minimum_msat(this.ptr, val.ptr);
-	}
-
-	/**
-	 * The maximum value in msat available for routing with a single HTLC.
+	 * Checks if two RouteHints contain equal inner contents.
 	 */
-	public Option_u64Z get_htlc_maximum_msat() {
-		long ret = bindings.RouteHint_get_htlc_maximum_msat(this.ptr);
-		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
-		return ret_hu_conv;
+	public long hash() {
+		long ret = bindings.RouteHint_hash(this.ptr);
+		return ret;
 	}
 
 	/**
-	 * The maximum value in msat available for routing with a single HTLC.
+	 * Checks if two RouteHints 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 void set_htlc_maximum_msat(Option_u64Z val) {
-		bindings.RouteHint_set_htlc_maximum_msat(this.ptr, val.ptr);
+	public boolean eq(RouteHint b) {
+		boolean ret = bindings.RouteHint_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
+		this.ptrs_to.add(b);
+		return ret;
 	}
 
 	/**
-	 * Constructs a new RouteHint given each field
+	 * Serialize the RouteHint object into a byte array which can be read by RouteHint_read
 	 */
-	public static RouteHint constructor_new(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.RouteHint_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);
-		RouteHint ret_hu_conv = new RouteHint(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(fees_arg);
-		return ret_hu_conv;
+	public byte[] write() {
+		byte[] ret = bindings.RouteHint_write(this.ptr);
+		return ret;
 	}
 
 	/**
-	 * Creates a copy of the RouteHint
+	 * Read a RouteHint from a byte array, created by RouteHint_write
 	 */
-	public RouteHint clone() {
-		long ret = bindings.RouteHint_clone(this.ptr);
-		RouteHint ret_hu_conv = new RouteHint(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+	public static Result_RouteHintDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.RouteHint_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_RouteHintDecodeErrorZ ret_hu_conv = Result_RouteHintDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}