X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelInfo.java;fp=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelInfo.java;h=90f1f4b7bd8ff9599fe6a17a87a5ce457303b25c;hb=246459dcbc3be28c38b4951140a5933f4b3aa024;hp=8c9e5727d8c2ad96cd5f4460cee79dd8f6831c9b;hpb=b52dde859c138f9257499496749d1eb89f9f6f43;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelInfo.java b/src/main/java/org/ldk/structs/ChannelInfo.java index 8c9e5727..90f1f4b7 100644 --- a/src/main/java/org/ldk/structs/ChannelInfo.java +++ b/src/main/java/org/ldk/structs/ChannelInfo.java @@ -24,14 +24,6 @@ public class ChannelInfo extends CommonBase { 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 byte[] get_node_one() { @@ -88,15 +80,21 @@ public class ChannelInfo extends CommonBase { this.ptrs_to.add(val); } + public ChannelInfo clone() { + long ret = bindings.ChannelInfo_clone(this.ptr); + ChannelInfo ret_hu_conv = new ChannelInfo(null, ret); + ret_hu_conv.ptrs_to.add(this); + return ret_hu_conv; + } + public byte[] write() { byte[] ret = bindings.ChannelInfo_write(this.ptr); return ret; } - public static ChannelInfo constructor_read(byte[] ser) { + public static Result_ChannelInfoDecodeErrorZ constructor_read(byte[] ser) { long ret = bindings.ChannelInfo_read(ser); - ChannelInfo ret_hu_conv = new ChannelInfo(null, ret); - ret_hu_conv.ptrs_to.add(ret_hu_conv); + Result_ChannelInfoDecodeErrorZ ret_hu_conv = Result_ChannelInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }