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

diff --git a/src/main/java/org/ldk/structs/ChannelAnnouncement.java b/src/main/java/org/ldk/structs/ChannelAnnouncement.java
index f3b04916..a49a163b 100644
--- a/src/main/java/org/ldk/structs/ChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/ChannelAnnouncement.java
@@ -2,80 +2,91 @@ 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 ChannelAnnouncement extends CommonBase {
 	ChannelAnnouncement(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.ChannelAnnouncement_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.ChannelAnnouncement_free(ptr); }
 	}
 
-	public ChannelAnnouncement(ChannelAnnouncement orig) {
-		super(bindings.ChannelAnnouncement_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public ChannelAnnouncement clone() {
+		long ret = bindings.ChannelAnnouncement_clone(this.ptr);
+		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public byte[] get_node_signature_1(ChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_1(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_node_signature_1() {
+		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_1(this.ptr);
 		return ret;
 	}
 
-	public void set_node_signature_1(ChannelAnnouncement this_ptr, byte[] val) {
-		bindings.ChannelAnnouncement_set_node_signature_1(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_node_signature_1(byte[] val) {
+		bindings.ChannelAnnouncement_set_node_signature_1(this.ptr, val);
 	}
 
-	public byte[] get_node_signature_2(ChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_2(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_node_signature_2() {
+		byte[] ret = bindings.ChannelAnnouncement_get_node_signature_2(this.ptr);
 		return ret;
 	}
 
-	public void set_node_signature_2(ChannelAnnouncement this_ptr, byte[] val) {
-		bindings.ChannelAnnouncement_set_node_signature_2(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_node_signature_2(byte[] val) {
+		bindings.ChannelAnnouncement_set_node_signature_2(this.ptr, val);
 	}
 
-	public byte[] get_bitcoin_signature_1(ChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_1(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_bitcoin_signature_1() {
+		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_1(this.ptr);
 		return ret;
 	}
 
-	public void set_bitcoin_signature_1(ChannelAnnouncement this_ptr, byte[] val) {
-		bindings.ChannelAnnouncement_set_bitcoin_signature_1(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_bitcoin_signature_1(byte[] val) {
+		bindings.ChannelAnnouncement_set_bitcoin_signature_1(this.ptr, val);
 	}
 
-	public byte[] get_bitcoin_signature_2(ChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_2(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_bitcoin_signature_2() {
+		byte[] ret = bindings.ChannelAnnouncement_get_bitcoin_signature_2(this.ptr);
 		return ret;
 	}
 
-	public void set_bitcoin_signature_2(ChannelAnnouncement this_ptr, byte[] val) {
-		bindings.ChannelAnnouncement_set_bitcoin_signature_2(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_bitcoin_signature_2(byte[] val) {
+		bindings.ChannelAnnouncement_set_bitcoin_signature_2(this.ptr, val);
 	}
 
-	public UnsignedChannelAnnouncement get_contents(ChannelAnnouncement this_ptr) {
-		UnsignedChannelAnnouncement ret = new UnsignedChannelAnnouncement(null, bindings.ChannelAnnouncement_get_contents(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public UnsignedChannelAnnouncement get_contents() {
+		long ret = bindings.ChannelAnnouncement_get_contents(this.ptr);
+		UnsignedChannelAnnouncement ret_hu_conv = new UnsignedChannelAnnouncement(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_contents(ChannelAnnouncement this_ptr, UnsignedChannelAnnouncement val) {
-		bindings.ChannelAnnouncement_set_contents(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public void set_contents(UnsignedChannelAnnouncement val) {
+		bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : val.ptr & ~1);
 		this.ptrs_to.add(val);
 	}
 
-	public ChannelAnnouncement(byte[] node_signature_1_arg, byte[] node_signature_2_arg, byte[] bitcoin_signature_1_arg, byte[] bitcoin_signature_2_arg, UnsignedChannelAnnouncement contents_arg) {
-		super(bindings.ChannelAnnouncement_new(node_signature_1_arg, node_signature_2_arg, bitcoin_signature_1_arg, bitcoin_signature_2_arg, contents_arg.ptr & ~1));
-		this.ptrs_to.add(contents_arg);
+	public static ChannelAnnouncement constructor_new(byte[] node_signature_1_arg, byte[] node_signature_2_arg, byte[] bitcoin_signature_1_arg, byte[] bitcoin_signature_2_arg, UnsignedChannelAnnouncement contents_arg) {
+		long ret = bindings.ChannelAnnouncement_new(node_signature_1_arg, node_signature_2_arg, bitcoin_signature_1_arg, bitcoin_signature_2_arg, contents_arg == null ? 0 : contents_arg.ptr & ~1);
+		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(contents_arg);
+		return ret_hu_conv;
+	}
+
+	public byte[] write() {
+		byte[] ret = bindings.ChannelAnnouncement_write(this.ptr);
+		return ret;
+	}
+
+	public static ChannelAnnouncement constructor_read(byte[] ser) {
+		long ret = bindings.ChannelAnnouncement_read(ser);
+		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	// Skipped ChannelAnnouncement_write
-	// Skipped ChannelAnnouncement_read
 }