X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHint.java;h=fc1e424979e5efe6f4243f5b02c985418250fd1e;hb=36e18c10580824f746164804e16e7f8a7dafd61d;hp=71fdc7fee9a79cf5fcefe4de6e13c936ace49926;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RouteHint.java b/src/main/java/org/ldk/structs/RouteHint.java
index 71fdc7fe..fc1e4249 100644
--- a/src/main/java/org/ldk/structs/RouteHint.java
+++ b/src/main/java/org/ldk/structs/RouteHint.java
@@ -2,78 +2,62 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class RouteHint extends CommonBase {
 	RouteHint(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.RouteHint_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.RouteHint_free(ptr); }
 	}
 
-	public RouteHint(RouteHint orig) {
-		super(bindings.RouteHint_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
-	}
-
-	public byte[] get_src_node_id(RouteHint this_ptr) {
-		byte[] ret = bindings.RouteHint_get_src_node_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_src_node_id() {
+		byte[] ret = bindings.RouteHint_get_src_node_id(this.ptr);
 		return ret;
 	}
 
-	public void set_src_node_id(RouteHint this_ptr, byte[] val) {
-		bindings.RouteHint_set_src_node_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_src_node_id(byte[] val) {
+		bindings.RouteHint_set_src_node_id(this.ptr, val);
 	}
 
-	public long get_short_channel_id(RouteHint this_ptr) {
-		long ret = bindings.RouteHint_get_short_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_short_channel_id() {
+		long ret = bindings.RouteHint_get_short_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_short_channel_id(RouteHint this_ptr, long val) {
-		bindings.RouteHint_set_short_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_short_channel_id(long val) {
+		bindings.RouteHint_set_short_channel_id(this.ptr, val);
 	}
 
-	public RoutingFees get_fees(RouteHint this_ptr) {
-		RoutingFees ret = new RoutingFees(null, bindings.RouteHint_get_fees(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	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);
+		return ret_hu_conv;
 	}
 
-	public void set_fees(RouteHint this_ptr, RoutingFees val) {
-		bindings.RouteHint_set_fees(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public void set_fees(RoutingFees val) {
+		bindings.RouteHint_set_fees(this.ptr, val == null ? 0 : val.ptr & ~1);
 		this.ptrs_to.add(val);
 	}
 
-	public short get_cltv_expiry_delta(RouteHint this_ptr) {
-		short ret = bindings.RouteHint_get_cltv_expiry_delta(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
-	}
-
-	public void set_cltv_expiry_delta(RouteHint this_ptr, short val) {
-		bindings.RouteHint_set_cltv_expiry_delta(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
-	}
-
-	public long get_htlc_minimum_msat(RouteHint this_ptr) {
-		long ret = bindings.RouteHint_get_htlc_minimum_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public short get_cltv_expiry_delta() {
+		short ret = bindings.RouteHint_get_cltv_expiry_delta(this.ptr);
 		return ret;
 	}
 
-	public void set_htlc_minimum_msat(RouteHint this_ptr, long val) {
-		bindings.RouteHint_set_htlc_minimum_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_cltv_expiry_delta(short val) {
+		bindings.RouteHint_set_cltv_expiry_delta(this.ptr, val);
 	}
 
-	public RouteHint(byte[] src_node_id_arg, long short_channel_id_arg, RoutingFees fees_arg, short cltv_expiry_delta_arg, long htlc_minimum_msat_arg) {
-		super(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));
-		this.ptrs_to.add(fees_arg);
+	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);
+		return ret_hu_conv;
 	}
 
 }