X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelDetails.ts;fp=ts%2Fstructs%2FChannelDetails.ts;h=b7ef907c228ba112e9f4a6d9b4353ce7965cf024;hb=246459dcbc3be28c38b4951140a5933f4b3aa024;hp=5e8c88a20fcfd3e28d452c802a7e40f626d6d734;hpb=b52dde859c138f9257499496749d1eb89f9f6f43;p=ldk-java diff --git a/ts/structs/ChannelDetails.ts b/ts/structs/ChannelDetails.ts index 5e8c88a2..b7ef907c 100644 --- a/ts/structs/ChannelDetails.ts +++ b/ts/structs/ChannelDetails.ts @@ -18,13 +18,6 @@ import * as bindings from '../bindings' // TODO: figure out location bindings.ChannelDetails_free(this.ptr); } } - public ChannelDetails clone() { - 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 Uint8Array get_channel_id() { Uint8Array ret = bindings.ChannelDetails_get_channel_id(this.ptr); return ret; @@ -53,14 +46,6 @@ import * as bindings from '../bindings' // TODO: figure out location 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); - // 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() { @@ -108,4 +93,11 @@ import * as bindings from '../bindings' // TODO: figure out location bindings.ChannelDetails_set_is_live(this.ptr, val); } + public ChannelDetails clone() { + 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; + } + }