X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFundingLocked.java;h=4439697f84b16da44478418bea75ed77a341dc09;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=0e7a157b7f294f9bb67106de0efdb2508e435b49;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/FundingLocked.java b/src/main/java/org/ldk/structs/FundingLocked.java
index 0e7a157b..4439697f 100644
--- a/src/main/java/org/ldk/structs/FundingLocked.java
+++ b/src/main/java/org/ldk/structs/FundingLocked.java
@@ -2,45 +2,60 @@ 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 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); }
 	}
 
-	public FundingLocked(FundingLocked orig) {
-		super(bindings.FundingLocked_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	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 byte[] get_channel_id(FundingLocked this_ptr) {
-		byte[] ret = bindings.FundingLocked_get_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.FundingLocked_get_channel_id(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);
+	public void set_channel_id(byte[] val) {
+		bindings.FundingLocked_set_channel_id(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);
+	public byte[] get_next_per_commitment_point() {
+		byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this.ptr);
 		return ret;
 	}
 
-	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);
+	public void set_next_per_commitment_point(byte[] val) {
+		bindings.FundingLocked_set_next_per_commitment_point(this.ptr, val);
 	}
 
-	public FundingLocked(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
-		super(bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg));
+	public static FundingLocked constructor_new(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 byte[] write() {
+		byte[] ret = bindings.FundingLocked_write(this.ptr);
+		return ret;
+	}
+
+	public static FundingLocked constructor_read(byte[] ser) {
+		long ret = bindings.FundingLocked_read(ser);
+		FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	// Skipped FundingLocked_write
-	// Skipped FundingLocked_read
 }