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

diff --git a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
index e11c520c..d4fa2aed 100644
--- a/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
+++ b/src/main/java/org/ldk/structs/UnsignedChannelAnnouncement.java
@@ -2,96 +2,108 @@ 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 UnsignedChannelAnnouncement extends CommonBase {
 	UnsignedChannelAnnouncement(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.UnsignedChannelAnnouncement_free(ptr);
+		if (ptr != 0) { bindings.UnsignedChannelAnnouncement_free(ptr); }
 	}
 
-	public UnsignedChannelAnnouncement(UnsignedChannelAnnouncement orig) {
-		super(bindings.UnsignedChannelAnnouncement_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	public UnsignedChannelAnnouncement clone() {
+		long ret = bindings.UnsignedChannelAnnouncement_clone(this.ptr);
+		UnsignedChannelAnnouncement ret_hu_conv = new UnsignedChannelAnnouncement(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public ChannelFeatures get_features(UnsignedChannelAnnouncement this_ptr) {
-		ChannelFeatures ret = new ChannelFeatures(null, bindings.UnsignedChannelAnnouncement_get_features(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public ChannelFeatures get_features() {
+		long ret = bindings.UnsignedChannelAnnouncement_get_features(this.ptr);
+		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public void set_features(ChannelFeatures val) {
+		bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
+		this.ptrs_to.add(val);
+		// Due to rust's strict-ownership memory model, in some cases we need to "move"
+		// an object to pass exclusive ownership to the function being called.
+		// In most cases, we avoid this being visible in GC'd languages by cloning the object
+		// at the FFI layer, creating a new object which Rust can claim ownership of
+		// However, in some cases (eg here), there is no way to clone an object, and thus
+		// we actually have to pass full ownership to Rust.
+		// Thus, after this call, val is reset to null and is now a dummy object.
+		val.ptr = 0;
 	}
 
-	// Skipped UnsignedChannelAnnouncement_set_features
-	public byte[] get_chain_hash(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_chain_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_chain_hash() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_get_chain_hash(this.ptr);
 		return ret;
 	}
 
-	public void set_chain_hash(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_chain_hash(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_chain_hash(byte[] val) {
+		bindings.UnsignedChannelAnnouncement_set_chain_hash(this.ptr, val);
 	}
 
-	public long get_short_channel_id(UnsignedChannelAnnouncement this_ptr) {
-		long ret = bindings.UnsignedChannelAnnouncement_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.UnsignedChannelAnnouncement_get_short_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_short_channel_id(UnsignedChannelAnnouncement this_ptr, long val) {
-		bindings.UnsignedChannelAnnouncement_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.UnsignedChannelAnnouncement_set_short_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_node_id_1(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_node_id_1() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_1(this.ptr);
 		return ret;
 	}
 
-	public void set_node_id_1(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_1(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_node_id_1(byte[] val) {
+		bindings.UnsignedChannelAnnouncement_set_node_id_1(this.ptr, val);
 	}
 
-	public byte[] get_node_id_2(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_node_id_2() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_get_node_id_2(this.ptr);
 		return ret;
 	}
 
-	public void set_node_id_2(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_node_id_2(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_node_id_2(byte[] val) {
+		bindings.UnsignedChannelAnnouncement_set_node_id_2(this.ptr, val);
 	}
 
-	public byte[] get_bitcoin_key_1(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_bitcoin_key_1() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_1(this.ptr);
 		return ret;
 	}
 
-	public void set_bitcoin_key_1(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_bitcoin_key_1(byte[] val) {
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_1(this.ptr, val);
 	}
 
-	public byte[] get_bitcoin_key_2(UnsignedChannelAnnouncement this_ptr) {
-		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	public byte[] get_bitcoin_key_2() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_get_bitcoin_key_2(this.ptr);
 		return ret;
 	}
 
-	public void set_bitcoin_key_2(UnsignedChannelAnnouncement this_ptr, byte[] val) {
-		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	public void set_bitcoin_key_2(byte[] val) {
+		bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, val);
+	}
+
+	public byte[] write() {
+		byte[] ret = bindings.UnsignedChannelAnnouncement_write(this.ptr);
+		return ret;
 	}
 
-	// Skipped UnsignedChannelAnnouncement_write
-	public UnsignedChannelAnnouncement(byte[] ser) {
-		super(bindings.UnsignedChannelAnnouncement_read(ser));
+	public static Result_UnsignedChannelAnnouncementDecodeErrorZ constructor_read(byte[] ser) {
+		long ret = bindings.UnsignedChannelAnnouncement_read(ser);
+		Result_UnsignedChannelAnnouncementDecodeErrorZ ret_hu_conv = Result_UnsignedChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }