X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUpdateFulfillHTLC.java;h=16fd61a6a691ff906e4380d9c0cdad45581cf32c;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=a373425c4767b768a28ae4232683e6ec8a709d1b;hpb=592c4f92dd3011a2f2a7988ce66ed166c3a8f58c;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java b/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java
index a373425c..16fd61a6 100644
--- a/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java
+++ b/src/main/java/org/ldk/structs/UpdateFulfillHTLC.java
@@ -2,65 +2,111 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * An update_fulfill_htlc message to be sent or received from a peer
+ */
+@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 {
 		super.finalize();
-		bindings.UpdateFulfillHTLC_free(ptr);
+		if (ptr != 0) { bindings.UpdateFulfillHTLC_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.UpdateFulfillHTLC_get_channel_id(this.ptr);
+		return ret;
 	}
 
-	public UpdateFulfillHTLC(UpdateFulfillHTLC orig) {
-		super(bindings.UpdateFulfillHTLC_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.UpdateFulfillHTLC_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
-	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);
+	/**
+	 * The HTLC ID
+	 */
+	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);
+	/**
+	 * The HTLC ID
+	 */
+	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);
+	/**
+	 * The pre-image of the payment hash, allowing HTLC redemption
+	 */
+	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);
+	/**
+	 * The pre-image of the payment hash, allowing HTLC redemption
+	 */
+	public void set_payment_preimage(byte[] val) {
+		bindings.UpdateFulfillHTLC_set_payment_preimage(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
-	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;
+	/**
+	 * Constructs a new UpdateFulfillHTLC given each field
+	 */
+	public static UpdateFulfillHTLC of(byte[] channel_id_arg, long htlc_id_arg, byte[] payment_preimage_arg) {
+		long ret = bindings.UpdateFulfillHTLC_new(InternalUtils.check_arr_len(channel_id_arg, 32), htlc_id_arg, InternalUtils.check_arr_len(payment_preimage_arg, 32));
+		if (ret >= 0 && ret <= 4096) { return null; }
+		UpdateFulfillHTLC ret_hu_conv = null; if (ret < 0 || ret > 4096) { 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);
+	long clone_ptr() {
+		long ret = bindings.UpdateFulfillHTLC_clone_ptr(this.ptr);
+		return ret;
 	}
 
-	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));
+	/**
+	 * Creates a copy of the UpdateFulfillHTLC
+	 */
+	public UpdateFulfillHTLC clone() {
+		long ret = bindings.UpdateFulfillHTLC_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		UpdateFulfillHTLC ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new UpdateFulfillHTLC(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public byte[] write(UpdateFulfillHTLC obj) {
-		byte[] ret = bindings.UpdateFulfillHTLC_write(obj == null ? 0 : obj.ptr & ~1);
-		this.ptrs_to.add(obj);
+	/**
+	 * Serialize the UpdateFulfillHTLC object into a byte array which can be read by UpdateFulfillHTLC_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.UpdateFulfillHTLC_write(this.ptr);
 		return ret;
 	}
 
-	public UpdateFulfillHTLC(byte[] ser) {
-		super(bindings.UpdateFulfillHTLC_read(ser));
+	/**
+	 * Read a UpdateFulfillHTLC from a byte array, created by UpdateFulfillHTLC_write
+	 */
+	public static Result_UpdateFulfillHTLCDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.UpdateFulfillHTLC_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_UpdateFulfillHTLCDecodeErrorZ ret_hu_conv = Result_UpdateFulfillHTLCDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }