X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOption_C2Tuple_usizeTransactionZZ.java;h=4c07583c6934ad18eea27993b9bdc333bc674017;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=0cb6c0a1ed8f82c92f50e3bdd282996c40c82fc8;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Option_C2Tuple_usizeTransactionZZ.java b/src/main/java/org/ldk/structs/Option_C2Tuple_usizeTransactionZZ.java index 0cb6c0a1..4c07583c 100644 --- a/src/main/java/org/ldk/structs/Option_C2Tuple_usizeTransactionZZ.java +++ b/src/main/java/org/ldk/structs/Option_C2Tuple_usizeTransactionZZ.java @@ -30,16 +30,13 @@ public class Option_C2Tuple_usizeTransactionZZ extends CommonBase { } public final static class Some extends Option_C2Tuple_usizeTransactionZZ { - public final TwoTuple some; + public final TwoTuple_usizeTransactionZ some; private Some(long ptr, bindings.LDKCOption_C2Tuple_usizeTransactionZZ.Some obj) { super(null, ptr); long some = obj.some; - long some_a = bindings.LDKC2Tuple_usizeTransactionZ_get_a(some); - byte[] some_b = bindings.LDKC2Tuple_usizeTransactionZ_get_b(some); - TwoTuple some_conv = new TwoTuple(some_a, some_b, () -> { - bindings.C2Tuple_usizeTransactionZ_free(some); - }); - this.some = some_conv; + TwoTuple_usizeTransactionZ some_hu_conv = new TwoTuple_usizeTransactionZ(null, some); + some_hu_conv.ptrs_to.add(this); + this.some = some_hu_conv; } } public final static class None extends Option_C2Tuple_usizeTransactionZZ { @@ -50,9 +47,9 @@ public class Option_C2Tuple_usizeTransactionZZ extends CommonBase { /** * Constructs a new COption_C2Tuple_usizeTransactionZZ containing a crate::c_types::derived::C2Tuple_usizeTransactionZ */ - public static Option_C2Tuple_usizeTransactionZZ some(TwoTuple o) { - long ret = bindings.COption_C2Tuple_usizeTransactionZZ_some(bindings.C2Tuple_usizeTransactionZ_new(o.a, o.b)); - if (ret < 1024) { return null; } + public static Option_C2Tuple_usizeTransactionZZ some(TwoTuple_usizeTransactionZ o) { + long ret = bindings.COption_C2Tuple_usizeTransactionZZ_some(o != null ? o.ptr : 0); + if (ret >= 0 && ret <= 4096) { return null; } Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; @@ -63,7 +60,7 @@ public class Option_C2Tuple_usizeTransactionZZ extends CommonBase { */ public static Option_C2Tuple_usizeTransactionZZ none() { long ret = bindings.COption_C2Tuple_usizeTransactionZZ_none(); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; @@ -75,7 +72,7 @@ public class Option_C2Tuple_usizeTransactionZZ extends CommonBase { */ public Option_C2Tuple_usizeTransactionZZ clone() { long ret = bindings.COption_C2Tuple_usizeTransactionZZ_clone(this.ptr); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(this); return ret_hu_conv;