X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FNodeAnnouncementInfo.ts;fp=ts%2Fstructs%2FNodeAnnouncementInfo.ts;h=ff71ce14e793cee4f3a5d9238e75465167b92718;hb=246459dcbc3be28c38b4951140a5933f4b3aa024;hp=2fa86c39952535472a92783954cb99ef765cb2e8;hpb=b52dde859c138f9257499496749d1eb89f9f6f43;p=ldk-java

diff --git a/ts/structs/NodeAnnouncementInfo.ts b/ts/structs/NodeAnnouncementInfo.ts
index 2fa86c39..ff71ce14 100644
--- a/ts/structs/NodeAnnouncementInfo.ts
+++ b/ts/structs/NodeAnnouncementInfo.ts
@@ -18,13 +18,6 @@ import * as bindings from '../bindings' // TODO: figure out location
                         bindings.NodeAnnouncementInfo_free(this.ptr);
                     }
                 }
-	public NodeAnnouncementInfo clone() {
-		number ret = bindings.NodeAnnouncementInfo_clone(this.ptr);
-		const ret_hu_conv: NodeAnnouncementInfo = new NodeAnnouncementInfo(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
-		return ret_hu_conv;
-	}
-
 	public NodeFeatures get_features() {
 		number ret = bindings.NodeAnnouncementInfo_get_features(this.ptr);
 		const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret);
@@ -35,14 +28,6 @@ import * as bindings from '../bindings' // TODO: figure out location
 	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 number get_last_update() {
@@ -73,7 +58,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public void set_addresses(NetAddress[] val) {
-		bindings.NodeAnnouncementInfo_set_addresses(this.ptr, (number[])Arrays.stream(val).map(arr_conv_12 -> arr_conv_12.ptr).toArray());
+		bindings.NodeAnnouncementInfo_set_addresses(this.ptr, Arrays.stream(val).map(val_conv_12 -> val_conv_12.ptr).toArray(number[]::new));
 		/* TODO 2 NetAddress  */;
 	}
 
@@ -90,23 +75,22 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public static NodeAnnouncementInfo constructor_new(NodeFeatures features_arg, number last_update_arg, Uint8Array rgb_arg, Uint8Array alias_arg, NetAddress[] addresses_arg, NodeAnnouncement announcement_message_arg) {
-		number ret = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, last_update_arg, rgb_arg, alias_arg, (number[])Arrays.stream(addresses_arg).map(arr_conv_12 -> arr_conv_12.ptr).toArray(), announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
+		number ret = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, last_update_arg, rgb_arg, alias_arg, Arrays.stream(addresses_arg).map(addresses_arg_conv_12 -> addresses_arg_conv_12.ptr).toArray(number[]::new), announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
 		const ret_hu_conv: NodeAnnouncementInfo = 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() {
+		number ret = bindings.NodeAnnouncementInfo_clone(this.ptr);
+		const ret_hu_conv: NodeAnnouncementInfo = new NodeAnnouncementInfo(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
 	public Uint8Array write() {
 		Uint8Array ret = bindings.NodeAnnouncementInfo_write(this.ptr);
 		return ret;