X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FResult_LockedChannelMonitorNoneZ.java;h=a82c5e19ad9bd6f25d5ef0678b3453be70829169;hb=d87886bb194886ef86d3597a5cdc142b6ccc89e9;hp=cae815845cbb294d706e16a4706cb913ad41e981;hpb=db55d4ed1b9ee1b2712db1df0f9b0081a70e269b;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java b/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java index cae81584..a82c5e19 100644 --- a/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java +++ b/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java @@ -4,6 +4,7 @@ import org.ldk.impl.bindings; import org.ldk.enums.*; import org.ldk.util.*; import java.util.Arrays; +import java.lang.ref.Reference; import javax.annotation.Nullable; public class Result_LockedChannelMonitorNoneZ extends CommonBase { @@ -13,7 +14,7 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { } static Result_LockedChannelMonitorNoneZ constr_from_ptr(long ptr) { - if (bindings.LDKCResult_LockedChannelMonitorNoneZ_result_ok(ptr)) { + if (bindings.CResult_LockedChannelMonitorNoneZ_is_ok(ptr)) { return new Result_LockedChannelMonitorNoneZ_OK(null, ptr); } else { return new Result_LockedChannelMonitorNoneZ_Err(null, ptr); @@ -23,8 +24,8 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { public final LockedChannelMonitor res; private Result_LockedChannelMonitorNoneZ_OK(Object _dummy, long ptr) { super(_dummy, ptr); - long res = bindings.LDKCResult_LockedChannelMonitorNoneZ_get_ok(ptr); - LockedChannelMonitor res_hu_conv = new LockedChannelMonitor(null, res); + long res = bindings.CResult_LockedChannelMonitorNoneZ_get_ok(ptr); + LockedChannelMonitor res_hu_conv = null; if (res < 0 || res > 4096) { res_hu_conv = new LockedChannelMonitor(null, res); } res_hu_conv.ptrs_to.add(this); this.res = res_hu_conv; } @@ -41,7 +42,8 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { */ public static Result_LockedChannelMonitorNoneZ ok(LockedChannelMonitor o) { long ret = bindings.CResult_LockedChannelMonitorNoneZ_ok(o == null ? 0 : o.ptr & ~1); - if (ret >= 0 && ret < 1024) { return null; } + Reference.reachabilityFence(o); + if (ret >= 0 && ret <= 4096) { return null; } Result_LockedChannelMonitorNoneZ ret_hu_conv = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(o); // Due to rust's strict-ownership memory model, in some cases we need to "move" @@ -51,7 +53,7 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { // 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 ret_hu_conv call, o is reset to null and is now a dummy object. - o.ptr = 0; + o.ptr = 0;; return ret_hu_conv; } @@ -60,9 +62,18 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { */ public static Result_LockedChannelMonitorNoneZ err() { long ret = bindings.CResult_LockedChannelMonitorNoneZ_err(); - if (ret >= 0 && ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_LockedChannelMonitorNoneZ ret_hu_conv = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret); return ret_hu_conv; } + /** + * Checks if the given object is currently in the success state + */ + public boolean is_ok() { + boolean ret = bindings.CResult_LockedChannelMonitorNoneZ_is_ok(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + }