X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHop.java;h=e54845e51add8e7c53af0a83d93f2d4d7a14ddc3;hb=76b59fb93494e68d9b02d204c9ed9a153c73dd9b;hp=496e4eb0a94443f4d2cee188caf629e0d9c9626a;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RouteHop.java b/src/main/java/org/ldk/structs/RouteHop.java
index 496e4eb0..e54845e5 100644
--- a/src/main/java/org/ldk/structs/RouteHop.java
+++ b/src/main/java/org/ldk/structs/RouteHop.java
@@ -2,91 +2,74 @@ 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 RouteHop extends CommonBase {
 	RouteHop(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.RouteHop_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.RouteHop_free(ptr); }
 	}
 
-	public RouteHop(RouteHop orig) {
-		super(bindings.RouteHop_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public static RouteHop constructor_clone(RouteHop orig) {
+		long ret = bindings.RouteHop_clone(orig == null ? 0 : orig.ptr & ~1);
+		RouteHop ret_hu_conv = new RouteHop(null, ret);
+		ret_hu_conv.ptrs_to.add(orig);
+		return ret_hu_conv;
 	}
 
-	public byte[] get_pubkey(RouteHop this_ptr) {
-		byte[] ret = bindings.RouteHop_get_pubkey(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_pubkey() {
+		byte[] ret = bindings.RouteHop_get_pubkey(this.ptr);
 		return ret;
 	}
 
-	public void set_pubkey(RouteHop this_ptr, byte[] val) {
-		bindings.RouteHop_set_pubkey(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_pubkey(byte[] val) {
+		bindings.RouteHop_set_pubkey(this.ptr, val);
 	}
 
-	public NodeFeatures get_node_features(RouteHop this_ptr) {
-		NodeFeatures ret = new NodeFeatures(null, bindings.RouteHop_get_node_features(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
-	}
-
-	public void set_node_features(RouteHop this_ptr, NodeFeatures val) {
-		bindings.RouteHop_set_node_features(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
+	public NodeFeatures get_node_features() {
+		long ret = bindings.RouteHop_get_node_features(this.ptr);
+		NodeFeatures ret_hu_conv = new NodeFeatures(null, ret);
+		return ret_hu_conv;
 	}
 
-	public long get_short_channel_id(RouteHop this_ptr) {
-		long ret = bindings.RouteHop_get_short_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	// Skipped RouteHop_set_node_features
+	public long get_short_channel_id() {
+		long ret = bindings.RouteHop_get_short_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_short_channel_id(RouteHop this_ptr, long val) {
-		bindings.RouteHop_set_short_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
-	}
-
-	public ChannelFeatures get_channel_features(RouteHop this_ptr) {
-		ChannelFeatures ret = new ChannelFeatures(null, bindings.RouteHop_get_channel_features(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public void set_short_channel_id(long val) {
+		bindings.RouteHop_set_short_channel_id(this.ptr, val);
 	}
 
-	public void set_channel_features(RouteHop this_ptr, ChannelFeatures val) {
-		bindings.RouteHop_set_channel_features(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
+	public ChannelFeatures get_channel_features() {
+		long ret = bindings.RouteHop_get_channel_features(this.ptr);
+		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
+		return ret_hu_conv;
 	}
 
-	public long get_fee_msat(RouteHop this_ptr) {
-		long ret = bindings.RouteHop_get_fee_msat(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	// Skipped RouteHop_set_channel_features
+	public long get_fee_msat() {
+		long ret = bindings.RouteHop_get_fee_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_fee_msat(RouteHop this_ptr, long val) {
-		bindings.RouteHop_set_fee_msat(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_fee_msat(long val) {
+		bindings.RouteHop_set_fee_msat(this.ptr, val);
 	}
 
-	public int get_cltv_expiry_delta(RouteHop this_ptr) {
-		int ret = bindings.RouteHop_get_cltv_expiry_delta(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public int get_cltv_expiry_delta() {
+		int ret = bindings.RouteHop_get_cltv_expiry_delta(this.ptr);
 		return ret;
 	}
 
-	public void set_cltv_expiry_delta(RouteHop this_ptr, int val) {
-		bindings.RouteHop_set_cltv_expiry_delta(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
-	}
-
-	public RouteHop(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) {
-		super(bindings.RouteHop_new(pubkey_arg, node_features_arg.ptr & ~1, short_channel_id_arg, channel_features_arg.ptr & ~1, fee_msat_arg, cltv_expiry_delta_arg));
-		this.ptrs_to.add(node_features_arg);
-		this.ptrs_to.add(channel_features_arg);
+	public void set_cltv_expiry_delta(int val) {
+		bindings.RouteHop_set_cltv_expiry_delta(this.ptr, val);
 	}
 
+	// Skipped RouteHop_new
 }