X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUpdateFulfillHTLC.java;h=966392bdc871f263ef1815938dcaba7b0b91ae8c;hb=9e8763c71cd61d55be7c869d973524f75209a3f3;hp=96f5843009b78535d63049e591ac71682600af53;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java b/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java
index 96f58430..966392bd 100644
--- a/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java
+++ b/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java
@@ -2,59 +2,68 @@ 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 UpdateFulfillHTLC extends CommonBase {
 	UpdateFulfillHTLC(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.UpdateFulfillHTLC_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.UpdateFulfillHTLC_free(ptr); }
 	}
 
-	public UpdateFulfillHTLC(UpdateFulfillHTLC orig) {
-		super(bindings.UpdateFulfillHTLC_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.UpdateFulfillHTLC_get_channel_id(this.ptr);
+		return ret;
+	}
+
+	public void set_channel_id(byte[] val) {
+		bindings.UpdateFulfillHTLC_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_channel_id(UpdateFulfillHTLC this_ptr) {
-		byte[] ret = bindings.UpdateFulfillHTLC_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_htlc_id() {
+		long ret = bindings.UpdateFulfillHTLC_get_htlc_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(UpdateFulfillHTLC this_ptr, byte[] val) {
-		bindings.UpdateFulfillHTLC_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_htlc_id(long val) {
+		bindings.UpdateFulfillHTLC_set_htlc_id(this.ptr, val);
 	}
 
-	public long get_htlc_id(UpdateFulfillHTLC this_ptr) {
-		long ret = bindings.UpdateFulfillHTLC_get_htlc_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_payment_preimage() {
+		byte[] ret = bindings.UpdateFulfillHTLC_get_payment_preimage(this.ptr);
 		return ret;
 	}
 
-	public void set_htlc_id(UpdateFulfillHTLC this_ptr, long val) {
-		bindings.UpdateFulfillHTLC_set_htlc_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_payment_preimage(byte[] val) {
+		bindings.UpdateFulfillHTLC_set_payment_preimage(this.ptr, val);
 	}
 
-	public byte[] get_payment_preimage(UpdateFulfillHTLC this_ptr) {
-		byte[] ret = bindings.UpdateFulfillHTLC_get_payment_preimage(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public static UpdateFulfillHTLC constructor_new(byte[] channel_id_arg, long htlc_id_arg, byte[] payment_preimage_arg) {
+		long ret = bindings.UpdateFulfillHTLC_new(channel_id_arg, htlc_id_arg, payment_preimage_arg);
+		UpdateFulfillHTLC ret_hu_conv = new UpdateFulfillHTLC(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public void set_payment_preimage(UpdateFulfillHTLC this_ptr, byte[] val) {
-		bindings.UpdateFulfillHTLC_set_payment_preimage(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public UpdateFulfillHTLC clone() {
+		long ret = bindings.UpdateFulfillHTLC_clone(this.ptr);
+		UpdateFulfillHTLC ret_hu_conv = new UpdateFulfillHTLC(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public UpdateFulfillHTLC(byte[] channel_id_arg, long htlc_id_arg, byte[] payment_preimage_arg) {
-		super(bindings.UpdateFulfillHTLC_new(channel_id_arg, htlc_id_arg, payment_preimage_arg));
+	public byte[] write() {
+		byte[] ret = bindings.UpdateFulfillHTLC_write(this.ptr);
+		return ret;
 	}
 
-	// Skipped UpdateFulfillHTLC_write
-	public UpdateFulfillHTLC(byte[] ser) {
-		super(bindings.UpdateFulfillHTLC_read(ser));
+	public static Result_UpdateFulfillHTLCDecodeErrorZ constructor_read(byte[] ser) {
+		long ret = bindings.UpdateFulfillHTLC_read(ser);
+		Result_UpdateFulfillHTLCDecodeErrorZ ret_hu_conv = Result_UpdateFulfillHTLCDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }