X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAnnouncementSignatures.java;h=a3bbf117914545cf0a2cc9405aee4ad13b2ca0ae;hb=76b59fb93494e68d9b02d204c9ed9a153c73dd9b;hp=90abb315a7e3ee09aeed38078bc87d2608de780b;hpb=ad15b3a4dbf3fbc7f08ef22d656bae79e8182008;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/AnnouncementSignatures.java b/src/main/java/org/ldk/structs/AnnouncementSignatures.java
index 90abb315..a3bbf117 100644
--- a/src/main/java/org/ldk/structs/AnnouncementSignatures.java
+++ b/src/main/java/org/ldk/structs/AnnouncementSignatures.java
@@ -2,71 +2,77 @@ 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 AnnouncementSignatures extends CommonBase {
 	AnnouncementSignatures(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.AnnouncementSignatures_free(ptr);
+		if (ptr != 0) { bindings.AnnouncementSignatures_free(ptr); }
 	}
 
-	public AnnouncementSignatures(AnnouncementSignatures orig) {
-		super(bindings.AnnouncementSignatures_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public static AnnouncementSignatures constructor_clone(AnnouncementSignatures orig) {
+		long ret = bindings.AnnouncementSignatures_clone(orig == null ? 0 : orig.ptr & ~1);
+		AnnouncementSignatures ret_hu_conv = new AnnouncementSignatures(null, ret);
+		ret_hu_conv.ptrs_to.add(orig);
+		return ret_hu_conv;
 	}
 
-	public byte[] get_channel_id(AnnouncementSignatures this_ptr) {
-		byte[] ret = bindings.AnnouncementSignatures_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.AnnouncementSignatures_get_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(AnnouncementSignatures this_ptr, byte[] val) {
-		bindings.AnnouncementSignatures_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.AnnouncementSignatures_set_channel_id(this.ptr, val);
 	}
 
-	public long get_short_channel_id(AnnouncementSignatures this_ptr) {
-		long ret = bindings.AnnouncementSignatures_get_short_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public long get_short_channel_id() {
+		long ret = bindings.AnnouncementSignatures_get_short_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_short_channel_id(AnnouncementSignatures this_ptr, long val) {
-		bindings.AnnouncementSignatures_set_short_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_short_channel_id(long val) {
+		bindings.AnnouncementSignatures_set_short_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_node_signature(AnnouncementSignatures this_ptr) {
-		byte[] ret = bindings.AnnouncementSignatures_get_node_signature(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_node_signature() {
+		byte[] ret = bindings.AnnouncementSignatures_get_node_signature(this.ptr);
 		return ret;
 	}
 
-	public void set_node_signature(AnnouncementSignatures this_ptr, byte[] val) {
-		bindings.AnnouncementSignatures_set_node_signature(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_node_signature(byte[] val) {
+		bindings.AnnouncementSignatures_set_node_signature(this.ptr, val);
 	}
 
-	public byte[] get_bitcoin_signature(AnnouncementSignatures this_ptr) {
-		byte[] ret = bindings.AnnouncementSignatures_get_bitcoin_signature(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_bitcoin_signature() {
+		byte[] ret = bindings.AnnouncementSignatures_get_bitcoin_signature(this.ptr);
 		return ret;
 	}
 
-	public void set_bitcoin_signature(AnnouncementSignatures this_ptr, byte[] val) {
-		bindings.AnnouncementSignatures_set_bitcoin_signature(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_bitcoin_signature(byte[] val) {
+		bindings.AnnouncementSignatures_set_bitcoin_signature(this.ptr, val);
 	}
 
-	public AnnouncementSignatures(byte[] channel_id_arg, long short_channel_id_arg, byte[] node_signature_arg, byte[] bitcoin_signature_arg) {
-		super(bindings.AnnouncementSignatures_new(channel_id_arg, short_channel_id_arg, node_signature_arg, bitcoin_signature_arg));
+	public static AnnouncementSignatures constructor_new(byte[] channel_id_arg, long short_channel_id_arg, byte[] node_signature_arg, byte[] bitcoin_signature_arg) {
+		long ret = bindings.AnnouncementSignatures_new(channel_id_arg, short_channel_id_arg, node_signature_arg, bitcoin_signature_arg);
+		AnnouncementSignatures ret_hu_conv = new AnnouncementSignatures(null, ret);
+		return ret_hu_conv;
 	}
 
-	// Skipped AnnouncementSignatures_write
-	public AnnouncementSignatures(byte[] ser) {
-		super(bindings.AnnouncementSignatures_read(ser));
+	public byte[] write(AnnouncementSignatures obj) {
+		byte[] ret = bindings.AnnouncementSignatures_write(obj == null ? 0 : obj.ptr & ~1);
+		this.ptrs_to.add(obj);
+		return ret;
+	}
+
+	public static AnnouncementSignatures constructor_read(byte[] ser) {
+		long ret = bindings.AnnouncementSignatures_read(ser);
+		AnnouncementSignatures ret_hu_conv = new AnnouncementSignatures(null, ret);
+		return ret_hu_conv;
 	}
 
 }