Merge pull request #2 from TheBlueMatt/main

[ldk-java] / src / main / java / org / ldk / structs / ChannelDetails.java

diff --git a/src/main/java/org/ldk/structs/ChannelDetails.java b/src/main/java/org/ldk/structs/ChannelDetails.java
index 4c690d2d67f876adfcb4af2dc113a5c3932fe343..216c017bdb1b602df4b3378ff372f643452b94db 100644 (file)
--- a/src/main/java/org/ldk/structs/ChannelDetails.java
+++ b/src/main/java/org/ldk/structs/ChannelDetails.java
@@ -14,13 +14,6 @@ public class ChannelDetails extends CommonBase {
                if (ptr != 0) { bindings.ChannelDetails_free(ptr); }
        }
 
-       public ChannelDetails clone() {
-               long ret = bindings.ChannelDetails_clone(this.ptr);
-               ChannelDetails ret_hu_conv = 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);
                return ret;
@@ -49,14 +42,6 @@ public class ChannelDetails extends CommonBase {
        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() {
@@ -104,4 +89,11 @@ public class ChannelDetails extends CommonBase {
                bindings.ChannelDetails_set_is_live(this.ptr, val);
        }
 
+       public ChannelDetails clone() {
+               long ret = bindings.ChannelDetails_clone(this.ptr);
+               ChannelDetails ret_hu_conv = new ChannelDetails(null, ret);
+               ret_hu_conv.ptrs_to.add(this);
+               return ret_hu_conv;
+       }
+
 }