X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUpdateAddHTLC.java;h=3f6643ce839b413362c4c0094b3ab5bb552b40f2;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=adca17e6c197965b74d1690576c64d2f37da2bc0;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UpdateAddHTLC.java b/src/main/java/org/ldk/structs/UpdateAddHTLC.java
index adca17e6..3f6643ce 100644
--- a/src/main/java/org/ldk/structs/UpdateAddHTLC.java
+++ b/src/main/java/org/ldk/structs/UpdateAddHTLC.java
@@ -2,77 +2,80 @@ 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 UpdateAddHTLC extends CommonBase {
 	UpdateAddHTLC(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.UpdateAddHTLC_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.UpdateAddHTLC_free(ptr); }
 	}
 
-	public UpdateAddHTLC(UpdateAddHTLC orig) {
-		super(bindings.UpdateAddHTLC_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public UpdateAddHTLC clone() {
+		long ret = bindings.UpdateAddHTLC_clone(this.ptr);
+		UpdateAddHTLC ret_hu_conv = new UpdateAddHTLC(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public byte[] get_channel_id(UpdateAddHTLC this_ptr) {
-		byte[] ret = bindings.UpdateAddHTLC_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.UpdateAddHTLC_get_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(UpdateAddHTLC this_ptr, byte[] val) {
-		bindings.UpdateAddHTLC_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_channel_id(byte[] val) {
+		bindings.UpdateAddHTLC_set_channel_id(this.ptr, val);
 	}
 
-	public long get_htlc_id(UpdateAddHTLC this_ptr) {
-		long ret = bindings.UpdateAddHTLC_get_htlc_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_htlc_id() {
+		long ret = bindings.UpdateAddHTLC_get_htlc_id(this.ptr);
 		return ret;
 	}
 
-	public void set_htlc_id(UpdateAddHTLC this_ptr, long val) {
-		bindings.UpdateAddHTLC_set_htlc_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_htlc_id(long val) {
+		bindings.UpdateAddHTLC_set_htlc_id(this.ptr, val);
 	}
 
-	public long get_amount_msat(UpdateAddHTLC this_ptr) {
-		long ret = bindings.UpdateAddHTLC_get_amount_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_amount_msat() {
+		long ret = bindings.UpdateAddHTLC_get_amount_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_amount_msat(UpdateAddHTLC this_ptr, long val) {
-		bindings.UpdateAddHTLC_set_amount_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_amount_msat(long val) {
+		bindings.UpdateAddHTLC_set_amount_msat(this.ptr, val);
 	}
 
-	public byte[] get_payment_hash(UpdateAddHTLC this_ptr) {
-		byte[] ret = bindings.UpdateAddHTLC_get_payment_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_payment_hash() {
+		byte[] ret = bindings.UpdateAddHTLC_get_payment_hash(this.ptr);
 		return ret;
 	}
 
-	public void set_payment_hash(UpdateAddHTLC this_ptr, byte[] val) {
-		bindings.UpdateAddHTLC_set_payment_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_payment_hash(byte[] val) {
+		bindings.UpdateAddHTLC_set_payment_hash(this.ptr, val);
 	}
 
-	public int get_cltv_expiry(UpdateAddHTLC this_ptr) {
-		int ret = bindings.UpdateAddHTLC_get_cltv_expiry(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public int get_cltv_expiry() {
+		int ret = bindings.UpdateAddHTLC_get_cltv_expiry(this.ptr);
 		return ret;
 	}
 
-	public void set_cltv_expiry(UpdateAddHTLC this_ptr, int val) {
-		bindings.UpdateAddHTLC_set_cltv_expiry(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_cltv_expiry(int val) {
+		bindings.UpdateAddHTLC_set_cltv_expiry(this.ptr, val);
 	}
 
-	// Skipped UpdateAddHTLC_write
-	public UpdateAddHTLC(byte[] ser) {
-		super(bindings.UpdateAddHTLC_read(ser));
+	public byte[] write() {
+		byte[] ret = bindings.UpdateAddHTLC_write(this.ptr);
+		return ret;
+	}
+
+	public static UpdateAddHTLC constructor_read(byte[] ser) {
+		long ret = bindings.UpdateAddHTLC_read(ser);
+		UpdateAddHTLC ret_hu_conv = new UpdateAddHTLC(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
 }