X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOffer.java;fp=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOffer.java;h=cbda12ee34651a7abd16887e851877525977af6a;hb=07d5d868dfe064aadb28a7f7ca6002c16be9723d;hp=f4a8e58b723eb32de77836d2ebf95301a78f9ae8;hpb=32973ea2749f8efd05b543dd774763513013b38b;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Offer.java b/src/main/java/org/ldk/structs/Offer.java index f4a8e58b..cbda12ee 100644 --- a/src/main/java/org/ldk/structs/Offer.java +++ b/src/main/java/org/ldk/structs/Offer.java @@ -61,16 +61,6 @@ public class Offer extends CommonBase { return ret; } - /** - * Returns whether the given chain is supported by the offer. - */ - public boolean supports_chain(byte[] chain) { - boolean ret = bindings.Offer_supports_chain(this.ptr, InternalUtils.check_arr_len(chain, 32)); - Reference.reachabilityFence(this); - Reference.reachabilityFence(chain); - return ret; - } - /** * Opaque bytes set by the originator. Useful for authentication and validating fields since it * is reflected in `invoice_request` messages along with all the other fields from the `offer`. @@ -115,8 +105,8 @@ public class Offer extends CommonBase { /** * Features pertaining to the offer. */ - public OfferFeatures features() { - long ret = bindings.Offer_features(this.ptr); + public OfferFeatures offer_features() { + long ret = bindings.Offer_offer_features(this.ptr); Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } org.ldk.structs.OfferFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.OfferFeatures(null, ret); } @@ -129,24 +119,15 @@ public class Offer extends CommonBase { * * If `None`, the offer does not expire. */ - public Option_DurationZ absolute_expiry() { + public Option_u64Z absolute_expiry() { long ret = bindings.Offer_absolute_expiry(this.ptr); Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } - org.ldk.structs.Option_DurationZ ret_hu_conv = org.ldk.structs.Option_DurationZ.constr_from_ptr(ret); + org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret); if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } - /** - * Whether the offer has expired. - */ - public boolean is_expired() { - boolean ret = bindings.Offer_is_expired(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - /** * The issuer of the offer, possibly beginning with `user@domain` or `domain`. Intended to be * displayed to the user but with the caveat that it has not been verified in any way. @@ -193,6 +174,34 @@ public class Offer extends CommonBase { return ret_hu_conv; } + /** + * The public key used by the recipient to sign invoices. + */ + public byte[] signing_pubkey() { + byte[] ret = bindings.Offer_signing_pubkey(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + /** + * Returns whether the given chain is supported by the offer. + */ + public boolean supports_chain(byte[] chain) { + boolean ret = bindings.Offer_supports_chain(this.ptr, InternalUtils.check_arr_len(chain, 32)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(chain); + return ret; + } + + /** + * Whether the offer has expired. + */ + public boolean is_expired() { + boolean ret = bindings.Offer_is_expired(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + /** * Returns whether the given quantity is valid for the offer. */ @@ -214,15 +223,6 @@ public class Offer extends CommonBase { return ret; } - /** - * The public key used by the recipient to sign invoices. - */ - public byte[] signing_pubkey() { - byte[] ret = bindings.Offer_signing_pubkey(this.ptr); - Reference.reachabilityFence(this); - return ret; - } - /** * Serialize the Offer object into a byte array which can be read by Offer_read */