X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRevokeAndACK.java;h=dcf6ddd95167123ddbda58973301ce6f79b584d3;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=d887797c49d8fea0c1392219fd940425dd3aeba5;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/RevokeAndACK.java b/src/main/java/org/ldk/structs/RevokeAndACK.java
index d887797c..dcf6ddd9 100644
--- a/src/main/java/org/ldk/structs/RevokeAndACK.java
+++ b/src/main/java/org/ldk/structs/RevokeAndACK.java
@@ -2,59 +2,69 @@ 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 RevokeAndACK extends CommonBase {
 	RevokeAndACK(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.RevokeAndACK_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.RevokeAndACK_free(ptr); }
 	}
 
-	public RevokeAndACK(RevokeAndACK orig) {
-		super(bindings.RevokeAndACK_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public RevokeAndACK clone() {
+		long ret = bindings.RevokeAndACK_clone(this.ptr);
+		RevokeAndACK ret_hu_conv = new RevokeAndACK(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public byte[] get_channel_id(RevokeAndACK this_ptr) {
-		byte[] ret = bindings.RevokeAndACK_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.RevokeAndACK_get_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(RevokeAndACK this_ptr, byte[] val) {
-		bindings.RevokeAndACK_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_channel_id(byte[] val) {
+		bindings.RevokeAndACK_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_per_commitment_secret(RevokeAndACK this_ptr) {
-		byte[] ret = bindings.RevokeAndACK_get_per_commitment_secret(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_per_commitment_secret() {
+		byte[] ret = bindings.RevokeAndACK_get_per_commitment_secret(this.ptr);
 		return ret;
 	}
 
-	public void set_per_commitment_secret(RevokeAndACK this_ptr, byte[] val) {
-		bindings.RevokeAndACK_set_per_commitment_secret(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_per_commitment_secret(byte[] val) {
+		bindings.RevokeAndACK_set_per_commitment_secret(this.ptr, val);
 	}
 
-	public byte[] get_next_per_commitment_point(RevokeAndACK this_ptr) {
-		byte[] ret = bindings.RevokeAndACK_get_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_next_per_commitment_point() {
+		byte[] ret = bindings.RevokeAndACK_get_next_per_commitment_point(this.ptr);
 		return ret;
 	}
 
-	public void set_next_per_commitment_point(RevokeAndACK this_ptr, byte[] val) {
-		bindings.RevokeAndACK_set_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_next_per_commitment_point(byte[] val) {
+		bindings.RevokeAndACK_set_next_per_commitment_point(this.ptr, val);
 	}
 
-	public RevokeAndACK(byte[] channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) {
-		super(bindings.RevokeAndACK_new(channel_id_arg, per_commitment_secret_arg, next_per_commitment_point_arg));
+	public static RevokeAndACK constructor_new(byte[] channel_id_arg, byte[] per_commitment_secret_arg, byte[] next_per_commitment_point_arg) {
+		long ret = bindings.RevokeAndACK_new(channel_id_arg, per_commitment_secret_arg, next_per_commitment_point_arg);
+		RevokeAndACK ret_hu_conv = new RevokeAndACK(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	// Skipped RevokeAndACK_write
-	public RevokeAndACK(byte[] ser) {
-		super(bindings.RevokeAndACK_read(ser));
+	public byte[] write() {
+		byte[] ret = bindings.RevokeAndACK_write(this.ptr);
+		return ret;
+	}
+
+	public static RevokeAndACK constructor_read(byte[] ser) {
+		long ret = bindings.RevokeAndACK_read(ser);
+		RevokeAndACK ret_hu_conv = new RevokeAndACK(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
 }