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

diff --git a/src/main/java/org/ldk/structs/FundingLocked.java b/src/main/java/org/ldk/structs/FundingLocked.java
index b330b650..4f5daef2 100644
--- a/src/main/java/org/ldk/structs/FundingLocked.java
+++ b/src/main/java/org/ldk/structs/FundingLocked.java
@@ -2,48 +2,87 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+
+/**
+ * A funding_locked message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class FundingLocked extends CommonBase {
 	FundingLocked(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.FundingLocked_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.FundingLocked_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.FundingLocked_get_channel_id(this.ptr);
+		return ret;
 	}
 
-	public FundingLocked(FundingLocked orig) {
-		super(bindings.FundingLocked_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.FundingLocked_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_channel_id(FundingLocked this_ptr) {
-		byte[] ret = bindings.FundingLocked_get_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The per-commitment point of the second commitment transaction
+	 */
+	public byte[] get_next_per_commitment_point() {
+		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(FundingLocked this_ptr, byte[] val) {
-		bindings.FundingLocked_set_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The per-commitment point of the second commitment transaction
+	 */
+	public void set_next_per_commitment_point(byte[] val) {
+		bindings.FundingLocked_set_next_per_commitment_point(this.ptr, val);
 	}
 
-	public byte[] get_next_per_commitment_point(FundingLocked this_ptr) {
-		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	/**
+	 * Constructs a new FundingLocked given each field
+	 */
+	public static FundingLocked of(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
+		long ret = bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg);
+		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public void set_next_per_commitment_point(FundingLocked this_ptr, byte[] val) {
-		bindings.FundingLocked_set_next_per_commitment_point(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the FundingLocked
+	 */
+	public FundingLocked clone() {
+		long ret = bindings.FundingLocked_clone(this.ptr);
+		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public FundingLocked(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
-		super(bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg));
+	/**
+	 * Serialize the FundingLocked object into a byte array which can be read by FundingLocked_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.FundingLocked_write(this.ptr);
+		return ret;
 	}
 
-	// Skipped FundingLocked_write
-	public FundingLocked(byte[] ser) {
-		super(bindings.FundingLocked_read(ser));
+	/**
+	 * Read a FundingLocked from a byte array, created by FundingLocked_write
+	 */
+	public static Result_FundingLockedDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.FundingLocked_read(ser);
+		Result_FundingLockedDecodeErrorZ ret_hu_conv = Result_FundingLockedDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }