X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAnnouncementSignatures.java;h=48e31a41e197d5baae888be8a0aff60145877247;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=dfc143f9fdefed2b7a8ad8f475fbd3b37a141693;hpb=166ff04616cfee975ce991607ca0df88857193df;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/AnnouncementSignatures.java b/src/main/java/org/ldk/structs/AnnouncementSignatures.java
index dfc143f9..48e31a41 100644
--- a/src/main/java/org/ldk/structs/AnnouncementSignatures.java
+++ b/src/main/java/org/ldk/structs/AnnouncementSignatures.java
@@ -2,70 +2,126 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * An announcement_signatures message to be sent or received from a peer
+ */
+@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 {
-		bindings.AnnouncementSignatures_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.AnnouncementSignatures_free(ptr); }
+	}
+
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.AnnouncementSignatures_get_channel_id(this.ptr);
+		return ret;
 	}
 
-	public AnnouncementSignatures(AnnouncementSignatures orig) {
-		super(bindings.AnnouncementSignatures_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.AnnouncementSignatures_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
-	public byte[] get_channel_id(AnnouncementSignatures this_ptr) {
-		byte[] ret = bindings.AnnouncementSignatures_get_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The short channel ID
+	 */
+	public long get_short_channel_id() {
+		long ret = bindings.AnnouncementSignatures_get_short_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(AnnouncementSignatures this_ptr, byte[] val) {
-		bindings.AnnouncementSignatures_set_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The short channel ID
+	 */
+	public void set_short_channel_id(long val) {
+		bindings.AnnouncementSignatures_set_short_channel_id(this.ptr, val);
 	}
 
-	public long get_short_channel_id(AnnouncementSignatures this_ptr) {
-		long ret = bindings.AnnouncementSignatures_get_short_channel_id(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A signature by the node key
+	 */
+	public byte[] get_node_signature() {
+		byte[] ret = bindings.AnnouncementSignatures_get_node_signature(this.ptr);
 		return ret;
 	}
 
-	public void set_short_channel_id(AnnouncementSignatures this_ptr, long val) {
-		bindings.AnnouncementSignatures_set_short_channel_id(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A signature by the node key
+	 */
+	public void set_node_signature(byte[] val) {
+		bindings.AnnouncementSignatures_set_node_signature(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
-	public byte[] get_node_signature(AnnouncementSignatures this_ptr) {
-		byte[] ret = bindings.AnnouncementSignatures_get_node_signature(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A signature by the funding key
+	 */
+	public byte[] get_bitcoin_signature() {
+		byte[] ret = bindings.AnnouncementSignatures_get_bitcoin_signature(this.ptr);
 		return ret;
 	}
 
-	public void set_node_signature(AnnouncementSignatures this_ptr, byte[] val) {
-		bindings.AnnouncementSignatures_set_node_signature(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A signature by the funding key
+	 */
+	public void set_bitcoin_signature(byte[] val) {
+		bindings.AnnouncementSignatures_set_bitcoin_signature(this.ptr, InternalUtils.check_arr_len(val, 64));
 	}
 
-	public byte[] get_bitcoin_signature(AnnouncementSignatures this_ptr) {
-		byte[] ret = bindings.AnnouncementSignatures_get_bitcoin_signature(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Constructs a new AnnouncementSignatures given each field
+	 */
+	public static AnnouncementSignatures of(byte[] channel_id_arg, long short_channel_id_arg, byte[] node_signature_arg, byte[] bitcoin_signature_arg) {
+		long ret = bindings.AnnouncementSignatures_new(InternalUtils.check_arr_len(channel_id_arg, 32), short_channel_id_arg, InternalUtils.check_arr_len(node_signature_arg, 64), InternalUtils.check_arr_len(bitcoin_signature_arg, 64));
+		if (ret >= 0 && ret <= 4096) { return null; }
+		AnnouncementSignatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new AnnouncementSignatures(null, ret); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.AnnouncementSignatures_clone_ptr(this.ptr);
 		return ret;
 	}
 
-	public void set_bitcoin_signature(AnnouncementSignatures this_ptr, byte[] val) {
-		bindings.AnnouncementSignatures_set_bitcoin_signature(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the AnnouncementSignatures
+	 */
+	public AnnouncementSignatures clone() {
+		long ret = bindings.AnnouncementSignatures_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		AnnouncementSignatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new AnnouncementSignatures(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	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));
+	/**
+	 * Serialize the AnnouncementSignatures object into a byte array which can be read by AnnouncementSignatures_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.AnnouncementSignatures_write(this.ptr);
+		return ret;
 	}
 
-	// Skipped AnnouncementSignatures_write
-	public AnnouncementSignatures(byte[] ser) {
-		super(bindings.AnnouncementSignatures_read(ser));
+	/**
+	 * Read a AnnouncementSignatures from a byte array, created by AnnouncementSignatures_write
+	 */
+	public static Result_AnnouncementSignaturesDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.AnnouncementSignatures_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_AnnouncementSignaturesDecodeErrorZ ret_hu_conv = Result_AnnouncementSignaturesDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }