X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelPublicKeys.java;h=0d2664a6d46f16bcd4d201b082b3cdc0583da16f;hb=9e8763c71cd61d55be7c869d973524f75209a3f3;hp=45fbc7d8052601262d03ef294495487b528f5808;hpb=2ed9081562d00a8645604b07629e963231d49e0f;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelPublicKeys.java b/src/main/java/org/ldk/structs/ChannelPublicKeys.java
index 45fbc7d8..0d2664a6 100644
--- a/src/main/java/org/ldk/structs/ChannelPublicKeys.java
+++ b/src/main/java/org/ldk/structs/ChannelPublicKeys.java
@@ -2,81 +2,86 @@ 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 ChannelPublicKeys extends CommonBase {
 	ChannelPublicKeys(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.ChannelPublicKeys_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.ChannelPublicKeys_free(ptr); }
 	}
 
-	public ChannelPublicKeys(ChannelPublicKeys orig) {
-		super(bindings.ChannelPublicKeys_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public byte[] get_funding_pubkey() {
+		byte[] ret = bindings.ChannelPublicKeys_get_funding_pubkey(this.ptr);
+		return ret;
+	}
+
+	public void set_funding_pubkey(byte[] val) {
+		bindings.ChannelPublicKeys_set_funding_pubkey(this.ptr, val);
 	}
 
-	public byte[] get_funding_pubkey(ChannelPublicKeys this_ptr) {
-		byte[] ret = bindings.ChannelPublicKeys_get_funding_pubkey(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_revocation_basepoint() {
+		byte[] ret = bindings.ChannelPublicKeys_get_revocation_basepoint(this.ptr);
 		return ret;
 	}
 
-	public void set_funding_pubkey(ChannelPublicKeys this_ptr, byte[] val) {
-		bindings.ChannelPublicKeys_set_funding_pubkey(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_revocation_basepoint(byte[] val) {
+		bindings.ChannelPublicKeys_set_revocation_basepoint(this.ptr, val);
 	}
 
-	public byte[] get_revocation_basepoint(ChannelPublicKeys this_ptr) {
-		byte[] ret = bindings.ChannelPublicKeys_get_revocation_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_payment_point() {
+		byte[] ret = bindings.ChannelPublicKeys_get_payment_point(this.ptr);
 		return ret;
 	}
 
-	public void set_revocation_basepoint(ChannelPublicKeys this_ptr, byte[] val) {
-		bindings.ChannelPublicKeys_set_revocation_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_payment_point(byte[] val) {
+		bindings.ChannelPublicKeys_set_payment_point(this.ptr, val);
 	}
 
-	public byte[] get_payment_point(ChannelPublicKeys this_ptr) {
-		byte[] ret = bindings.ChannelPublicKeys_get_payment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_delayed_payment_basepoint() {
+		byte[] ret = bindings.ChannelPublicKeys_get_delayed_payment_basepoint(this.ptr);
 		return ret;
 	}
 
-	public void set_payment_point(ChannelPublicKeys this_ptr, byte[] val) {
-		bindings.ChannelPublicKeys_set_payment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_delayed_payment_basepoint(byte[] val) {
+		bindings.ChannelPublicKeys_set_delayed_payment_basepoint(this.ptr, val);
 	}
 
-	public byte[] get_delayed_payment_basepoint(ChannelPublicKeys this_ptr) {
-		byte[] ret = bindings.ChannelPublicKeys_get_delayed_payment_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_htlc_basepoint() {
+		byte[] ret = bindings.ChannelPublicKeys_get_htlc_basepoint(this.ptr);
 		return ret;
 	}
 
-	public void set_delayed_payment_basepoint(ChannelPublicKeys this_ptr, byte[] val) {
-		bindings.ChannelPublicKeys_set_delayed_payment_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_htlc_basepoint(byte[] val) {
+		bindings.ChannelPublicKeys_set_htlc_basepoint(this.ptr, val);
 	}
 
-	public byte[] get_htlc_basepoint(ChannelPublicKeys this_ptr) {
-		byte[] ret = bindings.ChannelPublicKeys_get_htlc_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public static ChannelPublicKeys constructor_new(byte[] funding_pubkey_arg, byte[] revocation_basepoint_arg, byte[] payment_point_arg, byte[] delayed_payment_basepoint_arg, byte[] htlc_basepoint_arg) {
+		long ret = bindings.ChannelPublicKeys_new(funding_pubkey_arg, revocation_basepoint_arg, payment_point_arg, delayed_payment_basepoint_arg, htlc_basepoint_arg);
+		ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public void set_htlc_basepoint(ChannelPublicKeys this_ptr, byte[] val) {
-		bindings.ChannelPublicKeys_set_htlc_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public ChannelPublicKeys clone() {
+		long ret = bindings.ChannelPublicKeys_clone(this.ptr);
+		ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public ChannelPublicKeys(byte[] funding_pubkey_arg, byte[] revocation_basepoint_arg, byte[] payment_point_arg, byte[] delayed_payment_basepoint_arg, byte[] htlc_basepoint_arg) {
-		super(bindings.ChannelPublicKeys_new(funding_pubkey_arg, revocation_basepoint_arg, payment_point_arg, delayed_payment_basepoint_arg, htlc_basepoint_arg));
+	public byte[] write() {
+		byte[] ret = bindings.ChannelPublicKeys_write(this.ptr);
+		return ret;
 	}
 
-	// Skipped ChannelPublicKeys_write
-	public ChannelPublicKeys(byte[] ser) {
-		super(bindings.ChannelPublicKeys_read(ser));
+	public static Result_ChannelPublicKeysDecodeErrorZ constructor_read(byte[] ser) {
+		long ret = bindings.ChannelPublicKeys_read(ser);
+		Result_ChannelPublicKeysDecodeErrorZ ret_hu_conv = Result_ChannelPublicKeysDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }