X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FUpdateAddHTLC.java;h=589d5548b0d827ac937b6e1936c928920e74364d;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=2d1baf698532ea83b736a514b37a5b01a628b513;hpb=592c4f92dd3011a2f2a7988ce66ed166c3a8f58c;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/UpdateAddHTLC.java b/src/main/java/org/ldk/structs/UpdateAddHTLC.java
index 2d1baf69..589d5548 100644
--- a/src/main/java/org/ldk/structs/UpdateAddHTLC.java
+++ b/src/main/java/org/ldk/structs/UpdateAddHTLC.java
@@ -2,83 +2,125 @@ 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_add_htlc message to be sent or received from a peer
+ */
+@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 {
 		super.finalize();
-		bindings.UpdateAddHTLC_free(ptr);
-	}
-
-	public UpdateAddHTLC(UpdateAddHTLC orig) {
-		super(bindings.UpdateAddHTLC_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+		if (ptr != 0) { bindings.UpdateAddHTLC_free(ptr); }
 	}
 
-	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);
+	/**
+	 * The channel ID
+	 */
+	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);
+	/**
+	 * The channel ID
+	 */
+	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);
+	/**
+	 * The HTLC ID
+	 */
+	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);
+	/**
+	 * The HTLC ID
+	 */
+	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);
+	/**
+	 * The HTLC value in milli-satoshi
+	 */
+	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);
+	/**
+	 * The HTLC value in milli-satoshi
+	 */
+	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);
+	/**
+	 * The payment hash, the pre-image of which controls HTLC redemption
+	 */
+	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);
+	/**
+	 * The payment hash, the pre-image of which controls HTLC redemption
+	 */
+	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);
+	/**
+	 * The expiry height of the HTLC
+	 */
+	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);
+	/**
+	 * The expiry height of the HTLC
+	 */
+	public void set_cltv_expiry(int val) {
+		bindings.UpdateAddHTLC_set_cltv_expiry(this.ptr, val);
+	}
+
+	/**
+	 * Creates a copy of the UpdateAddHTLC
+	 */
+	public UpdateAddHTLC clone() {
+		long ret = bindings.UpdateAddHTLC_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		UpdateAddHTLC ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new UpdateAddHTLC(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public byte[] write(UpdateAddHTLC obj) {
-		byte[] ret = bindings.UpdateAddHTLC_write(obj == null ? 0 : obj.ptr & ~1);
-		this.ptrs_to.add(obj);
+	/**
+	 * Serialize the UpdateAddHTLC object into a byte array which can be read by UpdateAddHTLC_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.UpdateAddHTLC_write(this.ptr);
 		return ret;
 	}
 
-	public UpdateAddHTLC(byte[] ser) {
-		super(bindings.UpdateAddHTLC_read(ser));
+	/**
+	 * Read a UpdateAddHTLC from a byte array, created by UpdateAddHTLC_write
+	 */
+	public static Result_UpdateAddHTLCDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.UpdateAddHTLC_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_UpdateAddHTLCDecodeErrorZ ret_hu_conv = Result_UpdateAddHTLCDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }