X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelHandshakeLimits.java;h=e108446ee1f65d1a21dd944eccbd76ecff617398;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=1df3f8cbb8e73f8094228e1c99215768770b817a;hpb=ad15b3a4dbf3fbc7f08ef22d656bae79e8182008;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelHandshakeLimits.java b/src/main/java/org/ldk/structs/ChannelHandshakeLimits.java
index 1df3f8cb..e108446e 100644
--- a/src/main/java/org/ldk/structs/ChannelHandshakeLimits.java
+++ b/src/main/java/org/ldk/structs/ChannelHandshakeLimits.java
@@ -2,136 +2,127 @@ 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 ChannelHandshakeLimits extends CommonBase {
 	ChannelHandshakeLimits(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.ChannelHandshakeLimits_free(ptr);
+		if (ptr != 0) { bindings.ChannelHandshakeLimits_free(ptr); }
 	}
 
-	public ChannelHandshakeLimits(ChannelHandshakeLimits orig) {
-		super(bindings.ChannelHandshakeLimits_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public ChannelHandshakeLimits clone() {
+		long ret = bindings.ChannelHandshakeLimits_clone(this.ptr);
+		ChannelHandshakeLimits ret_hu_conv = new ChannelHandshakeLimits(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public long get_min_funding_satoshis(ChannelHandshakeLimits this_ptr) {
-		long ret = bindings.ChannelHandshakeLimits_get_min_funding_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_min_funding_satoshis() {
+		long ret = bindings.ChannelHandshakeLimits_get_min_funding_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_min_funding_satoshis(ChannelHandshakeLimits this_ptr, long val) {
-		bindings.ChannelHandshakeLimits_set_min_funding_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_min_funding_satoshis(long val) {
+		bindings.ChannelHandshakeLimits_set_min_funding_satoshis(this.ptr, val);
 	}
 
-	public long get_max_htlc_minimum_msat(ChannelHandshakeLimits this_ptr) {
-		long ret = bindings.ChannelHandshakeLimits_get_max_htlc_minimum_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_max_htlc_minimum_msat() {
+		long ret = bindings.ChannelHandshakeLimits_get_max_htlc_minimum_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_max_htlc_minimum_msat(ChannelHandshakeLimits this_ptr, long val) {
-		bindings.ChannelHandshakeLimits_set_max_htlc_minimum_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_max_htlc_minimum_msat(long val) {
+		bindings.ChannelHandshakeLimits_set_max_htlc_minimum_msat(this.ptr, val);
 	}
 
-	public long get_min_max_htlc_value_in_flight_msat(ChannelHandshakeLimits this_ptr) {
-		long ret = bindings.ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_min_max_htlc_value_in_flight_msat() {
+		long ret = bindings.ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_min_max_htlc_value_in_flight_msat(ChannelHandshakeLimits this_ptr, long val) {
-		bindings.ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_min_max_htlc_value_in_flight_msat(long val) {
+		bindings.ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(this.ptr, val);
 	}
 
-	public long get_max_channel_reserve_satoshis(ChannelHandshakeLimits this_ptr) {
-		long ret = bindings.ChannelHandshakeLimits_get_max_channel_reserve_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_max_channel_reserve_satoshis() {
+		long ret = bindings.ChannelHandshakeLimits_get_max_channel_reserve_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_max_channel_reserve_satoshis(ChannelHandshakeLimits this_ptr, long val) {
-		bindings.ChannelHandshakeLimits_set_max_channel_reserve_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_max_channel_reserve_satoshis(long val) {
+		bindings.ChannelHandshakeLimits_set_max_channel_reserve_satoshis(this.ptr, val);
 	}
 
-	public short get_min_max_accepted_htlcs(ChannelHandshakeLimits this_ptr) {
-		short ret = bindings.ChannelHandshakeLimits_get_min_max_accepted_htlcs(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public short get_min_max_accepted_htlcs() {
+		short ret = bindings.ChannelHandshakeLimits_get_min_max_accepted_htlcs(this.ptr);
 		return ret;
 	}
 
-	public void set_min_max_accepted_htlcs(ChannelHandshakeLimits this_ptr, short val) {
-		bindings.ChannelHandshakeLimits_set_min_max_accepted_htlcs(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_min_max_accepted_htlcs(short val) {
+		bindings.ChannelHandshakeLimits_set_min_max_accepted_htlcs(this.ptr, val);
 	}
 
-	public long get_min_dust_limit_satoshis(ChannelHandshakeLimits this_ptr) {
-		long ret = bindings.ChannelHandshakeLimits_get_min_dust_limit_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_min_dust_limit_satoshis() {
+		long ret = bindings.ChannelHandshakeLimits_get_min_dust_limit_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_min_dust_limit_satoshis(ChannelHandshakeLimits this_ptr, long val) {
-		bindings.ChannelHandshakeLimits_set_min_dust_limit_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_min_dust_limit_satoshis(long val) {
+		bindings.ChannelHandshakeLimits_set_min_dust_limit_satoshis(this.ptr, val);
 	}
 
-	public long get_max_dust_limit_satoshis(ChannelHandshakeLimits this_ptr) {
-		long ret = bindings.ChannelHandshakeLimits_get_max_dust_limit_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_max_dust_limit_satoshis() {
+		long ret = bindings.ChannelHandshakeLimits_get_max_dust_limit_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_max_dust_limit_satoshis(ChannelHandshakeLimits this_ptr, long val) {
-		bindings.ChannelHandshakeLimits_set_max_dust_limit_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_max_dust_limit_satoshis(long val) {
+		bindings.ChannelHandshakeLimits_set_max_dust_limit_satoshis(this.ptr, val);
 	}
 
-	public int get_max_minimum_depth(ChannelHandshakeLimits this_ptr) {
-		int ret = bindings.ChannelHandshakeLimits_get_max_minimum_depth(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public int get_max_minimum_depth() {
+		int ret = bindings.ChannelHandshakeLimits_get_max_minimum_depth(this.ptr);
 		return ret;
 	}
 
-	public void set_max_minimum_depth(ChannelHandshakeLimits this_ptr, int val) {
-		bindings.ChannelHandshakeLimits_set_max_minimum_depth(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_max_minimum_depth(int val) {
+		bindings.ChannelHandshakeLimits_set_max_minimum_depth(this.ptr, val);
 	}
 
-	public boolean get_force_announced_channel_preference(ChannelHandshakeLimits this_ptr) {
-		boolean ret = bindings.ChannelHandshakeLimits_get_force_announced_channel_preference(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public boolean get_force_announced_channel_preference() {
+		boolean ret = bindings.ChannelHandshakeLimits_get_force_announced_channel_preference(this.ptr);
 		return ret;
 	}
 
-	public void set_force_announced_channel_preference(ChannelHandshakeLimits this_ptr, boolean val) {
-		bindings.ChannelHandshakeLimits_set_force_announced_channel_preference(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_force_announced_channel_preference(boolean val) {
+		bindings.ChannelHandshakeLimits_set_force_announced_channel_preference(this.ptr, val);
 	}
 
-	public short get_their_to_self_delay(ChannelHandshakeLimits this_ptr) {
-		short ret = bindings.ChannelHandshakeLimits_get_their_to_self_delay(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public short get_their_to_self_delay() {
+		short ret = bindings.ChannelHandshakeLimits_get_their_to_self_delay(this.ptr);
 		return ret;
 	}
 
-	public void set_their_to_self_delay(ChannelHandshakeLimits this_ptr, short val) {
-		bindings.ChannelHandshakeLimits_set_their_to_self_delay(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_their_to_self_delay(short val) {
+		bindings.ChannelHandshakeLimits_set_their_to_self_delay(this.ptr, val);
 	}
 
-	public ChannelHandshakeLimits(long min_funding_satoshis_arg, long max_htlc_minimum_msat_arg, long min_max_htlc_value_in_flight_msat_arg, long max_channel_reserve_satoshis_arg, short min_max_accepted_htlcs_arg, long min_dust_limit_satoshis_arg, long max_dust_limit_satoshis_arg, int max_minimum_depth_arg, boolean force_announced_channel_preference_arg, short their_to_self_delay_arg) {
-		super(bindings.ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_htlc_minimum_msat_arg, min_max_htlc_value_in_flight_msat_arg, max_channel_reserve_satoshis_arg, min_max_accepted_htlcs_arg, min_dust_limit_satoshis_arg, max_dust_limit_satoshis_arg, max_minimum_depth_arg, force_announced_channel_preference_arg, their_to_self_delay_arg));
+	public static ChannelHandshakeLimits constructor_new(long min_funding_satoshis_arg, long max_htlc_minimum_msat_arg, long min_max_htlc_value_in_flight_msat_arg, long max_channel_reserve_satoshis_arg, short min_max_accepted_htlcs_arg, long min_dust_limit_satoshis_arg, long max_dust_limit_satoshis_arg, int max_minimum_depth_arg, boolean force_announced_channel_preference_arg, short their_to_self_delay_arg) {
+		long ret = bindings.ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_htlc_minimum_msat_arg, min_max_htlc_value_in_flight_msat_arg, max_channel_reserve_satoshis_arg, min_max_accepted_htlcs_arg, min_dust_limit_satoshis_arg, max_dust_limit_satoshis_arg, max_minimum_depth_arg, force_announced_channel_preference_arg, their_to_self_delay_arg);
+		ChannelHandshakeLimits ret_hu_conv = new ChannelHandshakeLimits(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public ChannelHandshakeLimits() {
-		super(bindings.ChannelHandshakeLimits_default());
+	public static ChannelHandshakeLimits constructor_default() {
+		long ret = bindings.ChannelHandshakeLimits_default();
+		ChannelHandshakeLimits ret_hu_conv = new ChannelHandshakeLimits(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
 }