X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FClosingSigned.java;h=cd5070e7502b5676d8de538cc680ed6a78dabc20;hb=b6cc0960eaee5a5bbc7fde79a56152d6dcd649d8;hp=25edd17cfdde4c1158f6af38e0da38f953cde17b;hpb=166ff04616cfee975ce991607ca0df88857193df;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ClosingSigned.java b/src/main/java/org/ldk/structs/ClosingSigned.java
index 25edd17c..cd5070e7 100644
--- a/src/main/java/org/ldk/structs/ClosingSigned.java
+++ b/src/main/java/org/ldk/structs/ClosingSigned.java
@@ -2,59 +2,102 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+
+/**
+ * A closing_signed message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ClosingSigned extends CommonBase {
 	ClosingSigned(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.ClosingSigned_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.ClosingSigned_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.ClosingSigned_get_channel_id(this.ptr);
+		return ret;
 	}
 
-	public ClosingSigned(ClosingSigned orig) {
-		super(bindings.ClosingSigned_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.ClosingSigned_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_channel_id(ClosingSigned this_ptr) {
-		byte[] ret = bindings.ClosingSigned_get_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The proposed total fee for the closing transaction
+	 */
+	public long get_fee_satoshis() {
+		long ret = bindings.ClosingSigned_get_fee_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(ClosingSigned this_ptr, byte[] val) {
-		bindings.ClosingSigned_set_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The proposed total fee for the closing transaction
+	 */
+	public void set_fee_satoshis(long val) {
+		bindings.ClosingSigned_set_fee_satoshis(this.ptr, val);
 	}
 
-	public long get_fee_satoshis(ClosingSigned this_ptr) {
-		long ret = bindings.ClosingSigned_get_fee_satoshis(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A signature on the closing transaction
+	 */
+	public byte[] get_signature() {
+		byte[] ret = bindings.ClosingSigned_get_signature(this.ptr);
 		return ret;
 	}
 
-	public void set_fee_satoshis(ClosingSigned this_ptr, long val) {
-		bindings.ClosingSigned_set_fee_satoshis(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A signature on the closing transaction
+	 */
+	public void set_signature(byte[] val) {
+		bindings.ClosingSigned_set_signature(this.ptr, val);
 	}
 
-	public byte[] get_signature(ClosingSigned this_ptr) {
-		byte[] ret = bindings.ClosingSigned_get_signature(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	/**
+	 * Constructs a new ClosingSigned given each field
+	 */
+	public static ClosingSigned of(byte[] channel_id_arg, long fee_satoshis_arg, byte[] signature_arg) {
+		long ret = bindings.ClosingSigned_new(channel_id_arg, fee_satoshis_arg, signature_arg);
+		ClosingSigned ret_hu_conv = new ClosingSigned(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public void set_signature(ClosingSigned this_ptr, byte[] val) {
-		bindings.ClosingSigned_set_signature(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the ClosingSigned
+	 */
+	public ClosingSigned clone() {
+		long ret = bindings.ClosingSigned_clone(this.ptr);
+		ClosingSigned ret_hu_conv = new ClosingSigned(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public ClosingSigned(byte[] channel_id_arg, long fee_satoshis_arg, byte[] signature_arg) {
-		super(bindings.ClosingSigned_new(channel_id_arg, fee_satoshis_arg, signature_arg));
+	/**
+	 * Serialize the ClosingSigned object into a byte array which can be read by ClosingSigned_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.ClosingSigned_write(this.ptr);
+		return ret;
 	}
 
-	// Skipped ClosingSigned_write
-	public ClosingSigned(byte[] ser) {
-		super(bindings.ClosingSigned_read(ser));
+	/**
+	 * Read a ClosingSigned from a byte array, created by ClosingSigned_write
+	 */
+	public static Result_ClosingSignedDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.ClosingSigned_read(ser);
+		Result_ClosingSignedDecodeErrorZ ret_hu_conv = Result_ClosingSignedDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }