X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelDetails.java;h=4c690d2d67f876adfcb4af2dc113a5c3932fe343;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=6e4f5bb89029a39908dbabca9983420b993584c7;hpb=110f2f104ba8fc34caa7e34e04737f36f064b050;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelDetails.java b/src/main/java/org/ldk/structs/ChannelDetails.java index 6e4f5bb8..4c690d2d 100644 --- a/src/main/java/org/ldk/structs/ChannelDetails.java +++ b/src/main/java/org/ldk/structs/ChannelDetails.java @@ -11,13 +11,13 @@ public class ChannelDetails extends CommonBase { @Override @SuppressWarnings("deprecation") protected void finalize() throws Throwable { super.finalize(); - bindings.ChannelDetails_free(ptr); + if (ptr != 0) { bindings.ChannelDetails_free(ptr); } } - public static ChannelDetails constructor_clone(ChannelDetails orig) { - long ret = bindings.ChannelDetails_clone(orig == null ? 0 : orig.ptr & ~1); + public ChannelDetails clone() { + long ret = bindings.ChannelDetails_clone(this.ptr); ChannelDetails ret_hu_conv = new ChannelDetails(null, ret); - ret_hu_conv.ptrs_to.add(orig); + ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -42,10 +42,23 @@ public class ChannelDetails extends CommonBase { public InitFeatures get_counterparty_features() { long ret = bindings.ChannelDetails_get_counterparty_features(this.ptr); InitFeatures ret_hu_conv = new InitFeatures(null, ret); + ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } - // Skipped ChannelDetails_set_counterparty_features + 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 long get_channel_value_satoshis() { long ret = bindings.ChannelDetails_get_channel_value_satoshis(this.ptr); return ret;