X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelDetails.ts;h=5e8c88a20fcfd3e28d452c802a7e40f626d6d734;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=834430ec70e8f8c103830c27572680bed4a2b37e;hpb=822471992c6bf6f9985e531cc5940e4cc35e3e4c;p=ldk-java

diff --git a/ts/structs/ChannelDetails.ts b/ts/structs/ChannelDetails.ts
index 834430ec..5e8c88a2 100644
--- a/ts/structs/ChannelDetails.ts
+++ b/ts/structs/ChannelDetails.ts
@@ -1,83 +1,101 @@
 
+            
 import CommonBase from './CommonBase';
 import * as bindings from '../bindings' // TODO: figure out location
 
-public class ChannelDetails extends CommonBase {
-	ChannelDetails(Object _dummy, long ptr) { super(ptr); }
-	@Override @SuppressWarnings("deprecation")
-	protected void finalize() throws Throwable {
-		super.finalize();
-		if (ptr != 0) { bindings.ChannelDetails_free(ptr); }
-	}
 
+
+            export default class ChannelDetails extends CommonBase {
+                constructor(_dummy: object, ptr: number) {
+                    super(ptr);
+                }
+
+                
+                protected finalize() {
+                    super.finalize();
+
+                    if (this.ptr != 0) {
+                        bindings.ChannelDetails_free(this.ptr);
+                    }
+                }
 	public ChannelDetails clone() {
-		uint32_t ret = bindings.ChannelDetails_clone(this.ptr);
-		ChannelDetails ret_hu_conv = new ChannelDetails(null, ret);
+		number ret = bindings.ChannelDetails_clone(this.ptr);
+		const ret_hu_conv: ChannelDetails = new ChannelDetails(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
-	public byte[] get_channel_id() {
-		byte[] ret = bindings.ChannelDetails_get_channel_id(this.ptr);
+	public Uint8Array get_channel_id() {
+		Uint8Array ret = bindings.ChannelDetails_get_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(byte[] val) {
+	public void set_channel_id(Uint8Array val) {
 		bindings.ChannelDetails_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_remote_network_id() {
-		byte[] ret = bindings.ChannelDetails_get_remote_network_id(this.ptr);
+	public Uint8Array get_remote_network_id() {
+		Uint8Array ret = bindings.ChannelDetails_get_remote_network_id(this.ptr);
 		return ret;
 	}
 
-	public void set_remote_network_id(byte[] val) {
+	public void set_remote_network_id(Uint8Array val) {
 		bindings.ChannelDetails_set_remote_network_id(this.ptr, val);
 	}
 
 	public InitFeatures get_counterparty_features() {
-		uint32_t ret = bindings.ChannelDetails_get_counterparty_features(this.ptr);
-		InitFeatures ret_hu_conv = new InitFeatures(null, ret);
+		number ret = bindings.ChannelDetails_get_counterparty_features(this.ptr);
+		const ret_hu_conv: InitFeatures = new InitFeatures(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
 	public void set_counterparty_features(InitFeatures val) {
 		bindings.ChannelDetails_set_counterparty_features(this.ptr, val == null ? 0 : val.ptr & ~1);
 		this.ptrs_to.add(val);
-	}
-
-	public long get_channel_value_satoshis() {
-		long ret = bindings.ChannelDetails_get_channel_value_satoshis(this.ptr);
+		// 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_channel_value_satoshis() {
+		number ret = bindings.ChannelDetails_get_channel_value_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_value_satoshis(long val) {
+	public void set_channel_value_satoshis(number val) {
 		bindings.ChannelDetails_set_channel_value_satoshis(this.ptr, val);
 	}
 
-	public long get_user_id() {
-		long ret = bindings.ChannelDetails_get_user_id(this.ptr);
+	public number get_user_id() {
+		number ret = bindings.ChannelDetails_get_user_id(this.ptr);
 		return ret;
 	}
 
-	public void set_user_id(long val) {
+	public void set_user_id(number val) {
 		bindings.ChannelDetails_set_user_id(this.ptr, val);
 	}
 
-	public long get_outbound_capacity_msat() {
-		long ret = bindings.ChannelDetails_get_outbound_capacity_msat(this.ptr);
+	public number get_outbound_capacity_msat() {
+		number ret = bindings.ChannelDetails_get_outbound_capacity_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_outbound_capacity_msat(long val) {
+	public void set_outbound_capacity_msat(number val) {
 		bindings.ChannelDetails_set_outbound_capacity_msat(this.ptr, val);
 	}
 
-	public long get_inbound_capacity_msat() {
-		long ret = bindings.ChannelDetails_get_inbound_capacity_msat(this.ptr);
+	public number get_inbound_capacity_msat() {
+		number ret = bindings.ChannelDetails_get_inbound_capacity_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_inbound_capacity_msat(long val) {
+	public void set_inbound_capacity_msat(number val) {
 		bindings.ChannelDetails_set_inbound_capacity_msat(this.ptr, val);
 	}