X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FUnsignedNodeAnnouncement.ts;fp=ts%2Fstructs%2FUnsignedNodeAnnouncement.ts;h=e7a35ed53d96cbd527599349526936ffab59caef;hb=246459dcbc3be28c38b4951140a5933f4b3aa024;hp=c874fc3be00e7297de7591cc485d372a67158739;hpb=b52dde859c138f9257499496749d1eb89f9f6f43;p=ldk-java diff --git a/ts/structs/UnsignedNodeAnnouncement.ts b/ts/structs/UnsignedNodeAnnouncement.ts index c874fc3b..e7a35ed5 100644 --- a/ts/structs/UnsignedNodeAnnouncement.ts +++ b/ts/structs/UnsignedNodeAnnouncement.ts @@ -18,13 +18,6 @@ import * as bindings from '../bindings' // TODO: figure out location bindings.UnsignedNodeAnnouncement_free(this.ptr); } } - public UnsignedNodeAnnouncement clone() { - number ret = bindings.UnsignedNodeAnnouncement_clone(this.ptr); - const ret_hu_conv: UnsignedNodeAnnouncement = new UnsignedNodeAnnouncement(null, ret); - ret_hu_conv.ptrs_to.add(this); - return ret_hu_conv; - } - public NodeFeatures get_features() { number ret = bindings.UnsignedNodeAnnouncement_get_features(this.ptr); const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret); @@ -35,14 +28,6 @@ import * as bindings from '../bindings' // TODO: figure out location public void set_features(NodeFeatures val) { bindings.UnsignedNodeAnnouncement_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 number get_timestamp() { @@ -82,10 +67,17 @@ import * as bindings from '../bindings' // TODO: figure out location } public void set_addresses(NetAddress[] val) { - bindings.UnsignedNodeAnnouncement_set_addresses(this.ptr, (number[])Arrays.stream(val).map(arr_conv_12 -> arr_conv_12.ptr).toArray()); + bindings.UnsignedNodeAnnouncement_set_addresses(this.ptr, Arrays.stream(val).map(val_conv_12 -> val_conv_12.ptr).toArray(number[]::new)); /* TODO 2 NetAddress */; } + public UnsignedNodeAnnouncement clone() { + number ret = bindings.UnsignedNodeAnnouncement_clone(this.ptr); + const ret_hu_conv: UnsignedNodeAnnouncement = new UnsignedNodeAnnouncement(null, ret); + ret_hu_conv.ptrs_to.add(this); + return ret_hu_conv; + } + public Uint8Array write() { Uint8Array ret = bindings.UnsignedNodeAnnouncement_write(this.ptr); return ret;