X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FSignedRawInvoice.java;h=5325d42fe65fc80de3d3d748dd345dc1aacee5d1;hb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;hp=90714a619fb3e93c74f1ea135a50085aca1eeedf;hpb=9d146759e11191b55130be7a1b6988d3f289a168;p=ldk-java diff --git a/src/main/java/org/ldk/structs/SignedRawInvoice.java b/src/main/java/org/ldk/structs/SignedRawInvoice.java index 90714a61..5325d42f 100644 --- a/src/main/java/org/ldk/structs/SignedRawInvoice.java +++ b/src/main/java/org/ldk/structs/SignedRawInvoice.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; @@ -30,17 +31,30 @@ public class SignedRawInvoice extends CommonBase { */ public boolean eq(SignedRawInvoice b) { boolean ret = bindings.SignedRawInvoice_eq(this.ptr, b == null ? 0 : b.ptr & ~1); + Reference.reachabilityFence(this); + Reference.reachabilityFence(b); this.ptrs_to.add(b); return ret; } + @Override public boolean equals(Object o) { + if (!(o instanceof SignedRawInvoice)) return false; + return this.eq((SignedRawInvoice)o); + } + long clone_ptr() { + long ret = bindings.SignedRawInvoice_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + 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); + Reference.reachabilityFence(this); + 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; } @@ -53,7 +67,8 @@ public class SignedRawInvoice extends CommonBase { */ public ThreeTuple_RawInvoice_u832InvoiceSignatureZ into_parts() { long ret = bindings.SignedRawInvoice_into_parts(this.ptr); - if (ret < 1024) { return null; } + Reference.reachabilityFence(this); + 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); ; @@ -65,8 +80,9 @@ 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); + Reference.reachabilityFence(this); + 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; } @@ -76,6 +92,7 @@ public class SignedRawInvoice extends CommonBase { */ public byte[] hash() { byte[] ret = bindings.SignedRawInvoice_hash(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -84,8 +101,9 @@ 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); + Reference.reachabilityFence(this); + 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; } @@ -95,7 +113,8 @@ 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; } + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } Result_PayeePubKeyErrorZ ret_hu_conv = Result_PayeePubKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -106,16 +125,18 @@ public class SignedRawInvoice extends CommonBase { */ public boolean check_signature() { boolean ret = bindings.SignedRawInvoice_check_signature(this.ptr); + Reference.reachabilityFence(this); return ret; } /** * Read a SignedRawInvoice object from a string */ - public static Result_SignedRawInvoiceNoneZ from_str(java.lang.String s) { + public static Result_SignedRawInvoiceParseErrorZ from_str(java.lang.String s) { long ret = bindings.SignedRawInvoice_from_str(s); - if (ret < 1024) { return null; } - Result_SignedRawInvoiceNoneZ ret_hu_conv = Result_SignedRawInvoiceNoneZ.constr_from_ptr(ret); + Reference.reachabilityFence(s); + if (ret >= 0 && ret <= 4096) { return null; } + Result_SignedRawInvoiceParseErrorZ ret_hu_conv = Result_SignedRawInvoiceParseErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -124,6 +145,7 @@ public class SignedRawInvoice extends CommonBase { */ public String to_str() { String ret = bindings.SignedRawInvoice_to_str(this.ptr); + Reference.reachabilityFence(this); return ret; }