X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FSignedRawInvoice.java;h=f9fd6c3d99994142e38876e689a79ac891d8c3ed;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=c097c202990ba3dc555f508ed9c15df641c3edfe;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java diff --git a/src/main/java/org/ldk/structs/SignedRawInvoice.java b/src/main/java/org/ldk/structs/SignedRawInvoice.java index c097c202..f9fd6c3d 100644 --- a/src/main/java/org/ldk/structs/SignedRawInvoice.java +++ b/src/main/java/org/ldk/structs/SignedRawInvoice.java @@ -34,13 +34,18 @@ public class SignedRawInvoice extends CommonBase { return ret; } + long clone_ptr() { + long ret = bindings.SignedRawInvoice_clone_ptr(this.ptr); + return ret; + } + /** * Creates a copy of the SignedRawInvoice */ public SignedRawInvoice clone() { long ret = bindings.SignedRawInvoice_clone(this.ptr); - if (ret < 1024) { return null; } - SignedRawInvoice ret_hu_conv = new SignedRawInvoice(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + SignedRawInvoice ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new SignedRawInvoice(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -51,23 +56,13 @@ public class SignedRawInvoice extends CommonBase { * 2. hash of the raw invoice * 3. signature */ - public ThreeTuple into_parts() { + public ThreeTuple_RawInvoice_u832InvoiceSignatureZ into_parts() { long ret = bindings.SignedRawInvoice_into_parts(this.ptr); - if (ret < 1024) { return null; } - long ret_a = bindings.LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(ret); - RawInvoice ret_a_hu_conv = new RawInvoice(null, ret_a); - ret_a_hu_conv.ptrs_to.add(this);; - byte[] ret_b = bindings.LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(ret); - long ret_c = bindings.LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(ret); - InvoiceSignature ret_c_hu_conv = new InvoiceSignature(null, ret_c); - ret_c_hu_conv.ptrs_to.add(this);; - ThreeTuple ret_conv = new ThreeTuple(ret_a_hu_conv, ret_b, ret_c_hu_conv, () -> { - bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(ret); - }); - ret_a_hu_conv.ptrs_to.add(ret_conv); - ret_c_hu_conv.ptrs_to.add(ret_conv); - this.ptrs_to.add(this); - return ret_conv; + if (ret >= 0 && ret <= 4096) { return null; } + ThreeTuple_RawInvoice_u832InvoiceSignatureZ ret_hu_conv = new ThreeTuple_RawInvoice_u832InvoiceSignatureZ(null, ret); + ret_hu_conv.ptrs_to.add(this); + ; + return ret_hu_conv; } /** @@ -75,8 +70,8 @@ public class SignedRawInvoice extends CommonBase { */ public RawInvoice raw_invoice() { long ret = bindings.SignedRawInvoice_raw_invoice(this.ptr); - if (ret < 1024) { return null; } - RawInvoice ret_hu_conv = new RawInvoice(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + RawInvoice ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RawInvoice(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -94,8 +89,8 @@ public class SignedRawInvoice extends CommonBase { */ public InvoiceSignature signature() { long ret = bindings.SignedRawInvoice_signature(this.ptr); - if (ret < 1024) { return null; } - InvoiceSignature ret_hu_conv = new InvoiceSignature(null, ret); + if (ret >= 0 && ret <= 4096) { return null; } + InvoiceSignature ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new InvoiceSignature(null, ret); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -105,7 +100,7 @@ public class SignedRawInvoice extends CommonBase { */ public Result_PayeePubKeyErrorZ recover_payee_pub_key() { long ret = bindings.SignedRawInvoice_recover_payee_pub_key(this.ptr); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_PayeePubKeyErrorZ ret_hu_conv = Result_PayeePubKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -124,7 +119,7 @@ public class SignedRawInvoice extends CommonBase { */ public static Result_SignedRawInvoiceNoneZ from_str(java.lang.String s) { long ret = bindings.SignedRawInvoice_from_str(s); - if (ret < 1024) { return null; } + if (ret >= 0 && ret <= 4096) { return null; } Result_SignedRawInvoiceNoneZ ret_hu_conv = Result_SignedRawInvoiceNoneZ.constr_from_ptr(ret); return ret_hu_conv; }