X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelInfo.ts;h=b99fd456af0890c858f1bafd247cd8a476d95d17;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=cbbdfba14f75a8731ef1f77d96a1d43e6696ceb8;hpb=e9c2970adecaa14b3e83e11eb160a7bcbdae20da;p=ldk-java

diff --git a/ts/structs/ChannelInfo.ts b/ts/structs/ChannelInfo.ts
index cbbdfba1..b99fd456 100644
--- a/ts/structs/ChannelInfo.ts
+++ b/ts/structs/ChannelInfo.ts
@@ -21,12 +21,21 @@ import * as bindings from '../bindings' // TODO: figure out location
 	public ChannelFeatures get_features() {
 		number ret = bindings.ChannelInfo_get_features(this.ptr);
 		const ret_hu_conv: ChannelFeatures = new ChannelFeatures(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
 	public void set_features(ChannelFeatures val) {
 		bindings.ChannelInfo_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 Uint8Array get_node_one() {
@@ -41,6 +50,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	public DirectionalChannelInfo get_one_to_two() {
 		number ret = bindings.ChannelInfo_get_one_to_two(this.ptr);
 		const ret_hu_conv: DirectionalChannelInfo = new DirectionalChannelInfo(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
@@ -61,6 +71,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	public DirectionalChannelInfo get_two_to_one() {
 		number ret = bindings.ChannelInfo_get_two_to_one(this.ptr);
 		const ret_hu_conv: DirectionalChannelInfo = new DirectionalChannelInfo(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
@@ -72,6 +83,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	public ChannelAnnouncement get_announcement_message() {
 		number ret = bindings.ChannelInfo_get_announcement_message(this.ptr);
 		const ret_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
@@ -88,6 +100,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	public static ChannelInfo constructor_read(Uint8Array ser) {
 		number ret = bindings.ChannelInfo_read(ser);
 		const ret_hu_conv: ChannelInfo = new ChannelInfo(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}