X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.ts;fp=ts%2Fstructs%2FResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.ts;h=81d95ece646131bf4eff9cbf498c1ed3df862a0e;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=e9feca6e0b8cc36cb834a716df15c1335fc42f3c;hpb=e9c2970adecaa14b3e83e11eb160a7bcbdae20da;p=ldk-java diff --git a/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.ts b/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.ts index e9feca6e..81d95ece 100644 --- a/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.ts +++ b/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.ts @@ -22,12 +22,22 @@ public class Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ extends CommonB number res = bindings.LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(ptr); Uint8Array res_a = bindings.LDKC2Tuple_BlockHashChannelManagerZ_get_a(res); number res_b = bindings.LDKC2Tuple_BlockHashChannelManagerZ_get_b(res); - const res_b_hu_conv: ChannelManager = new ChannelManager(null, res_b);; + const res_b_hu_conv: ChannelManager = new ChannelManager(null, res_b); + res_b_hu_conv.ptrs_to.add(this);; TwoTuple res_conv = new TwoTuple(res_a, res_b_hu_conv); this.res = res_conv; } public Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK(TwoTuple res) { - this(null, bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(bindings.C2Tuple_BlockHashChannelManagerZ_new(res.a, res.b == null ? 0 : res.b.ptr & ~1/*XXX: this.ptrs_to.add(res_b)*/))); + this(null, bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(bindings.C2Tuple_BlockHashChannelManagerZ_new(res.a, res.b == null ? 0 : res.b.ptr & ~1))); + this.ptrs_to.add(res.b); + // 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, res.b is reset to null and is now a dummy object. + res.b.ptr = 0; } } @@ -37,6 +47,7 @@ public class Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ extends CommonB super(_dummy, ptr); number err = bindings.LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); + err_hu_conv.ptrs_to.add(this); this.err = err_hu_conv; } public Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_Err(DecodeError err) {