X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNodeAnnouncementInfo.java;fp=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNodeAnnouncementInfo.java;h=561b4dd386243ca56e48be946922c38837487e00;hb=246459dcbc3be28c38b4951140a5933f4b3aa024;hp=f59c055ef35d2b6a8382a148fec2a0f6f96c727b;hpb=b52dde859c138f9257499496749d1eb89f9f6f43;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NodeAnnouncementInfo.java b/src/main/java/org/ldk/structs/NodeAnnouncementInfo.java
index f59c055e..561b4dd3 100644
--- a/src/main/java/org/ldk/structs/NodeAnnouncementInfo.java
+++ b/src/main/java/org/ldk/structs/NodeAnnouncementInfo.java
@@ -14,13 +14,6 @@ public class NodeAnnouncementInfo extends CommonBase {
 		if (ptr != 0) { bindings.NodeAnnouncementInfo_free(ptr); }
 	}
 
-	public NodeAnnouncementInfo clone() {
-		long ret = bindings.NodeAnnouncementInfo_clone(this.ptr);
-		NodeAnnouncementInfo ret_hu_conv = new NodeAnnouncementInfo(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
-		return ret_hu_conv;
-	}
-
 	public NodeFeatures get_features() {
 		long ret = bindings.NodeAnnouncementInfo_get_features(this.ptr);
 		NodeFeatures ret_hu_conv = new NodeFeatures(null, ret);
@@ -31,14 +24,6 @@ public class NodeAnnouncementInfo extends CommonBase {
 	public void set_features(NodeFeatures val) {
 		bindings.NodeAnnouncementInfo_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;
 	}
 
 	public int get_last_update() {
@@ -69,7 +54,7 @@ public class NodeAnnouncementInfo extends CommonBase {
 	}
 
 	public void set_addresses(NetAddress[] val) {
-		bindings.NodeAnnouncementInfo_set_addresses(this.ptr, Arrays.stream(val).mapToLong(arr_conv_12 -> arr_conv_12.ptr).toArray());
+		bindings.NodeAnnouncementInfo_set_addresses(this.ptr, Arrays.stream(val).mapToLong(val_conv_12 -> val_conv_12.ptr).toArray());
 		/* TODO 2 NetAddress  */;
 	}
 
@@ -86,23 +71,22 @@ public class NodeAnnouncementInfo extends CommonBase {
 	}
 
 	public static NodeAnnouncementInfo constructor_new(NodeFeatures features_arg, int last_update_arg, byte[] rgb_arg, byte[] alias_arg, NetAddress[] addresses_arg, NodeAnnouncement announcement_message_arg) {
-		long ret = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, last_update_arg, rgb_arg, alias_arg, Arrays.stream(addresses_arg).mapToLong(arr_conv_12 -> arr_conv_12.ptr).toArray(), announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
+		long ret = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, last_update_arg, rgb_arg, alias_arg, Arrays.stream(addresses_arg).mapToLong(addresses_arg_conv_12 -> addresses_arg_conv_12.ptr).toArray(), announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
 		NodeAnnouncementInfo ret_hu_conv = new NodeAnnouncementInfo(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		ret_hu_conv.ptrs_to.add(features_arg);
-		// 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 ret_hu_conv 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 ret_hu_conv call, features_arg is reset to null and is now a dummy object.
-		features_arg.ptr = 0;
 		/* TODO 2 NetAddress  */;
 		ret_hu_conv.ptrs_to.add(announcement_message_arg);
 		return ret_hu_conv;
 	}
 
+	public NodeAnnouncementInfo clone() {
+		long ret = bindings.NodeAnnouncementInfo_clone(this.ptr);
+		NodeAnnouncementInfo ret_hu_conv = new NodeAnnouncementInfo(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
 	public byte[] write() {
 		byte[] ret = bindings.NodeAnnouncementInfo_write(this.ptr);
 		return ret;