X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRawDataPart.java;h=3c730c9cfd94d5086880aa6c251c5ea51b3e5188;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=637e344d1378013a1b24b6c52ce16d1f919b594c;hpb=ba1af51214a8ea2de62b84cd23b6145173c71752;p=ldk-java diff --git a/src/main/java/org/ldk/structs/RawDataPart.java b/src/main/java/org/ldk/structs/RawDataPart.java index 637e344d..3c730c9c 100644 --- a/src/main/java/org/ldk/structs/RawDataPart.java +++ b/src/main/java/org/ldk/structs/RawDataPart.java @@ -4,11 +4,12 @@ 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; /** - * Data of the `RawInvoice` that is encoded in the data part + * Data of the [`RawBolt11Invoice`] that is encoded in the data part */ @SuppressWarnings("unchecked") // We correctly assign various generic arrays public class RawDataPart extends CommonBase { @@ -24,18 +25,21 @@ public class RawDataPart extends CommonBase { */ public PositiveTimestamp get_timestamp() { long ret = bindings.RawDataPart_get_timestamp(this.ptr); - if (ret < 1024) { return null; } - PositiveTimestamp ret_hu_conv = new PositiveTimestamp(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.PositiveTimestamp ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.PositiveTimestamp(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } /** * generation time of the invoice */ - public void set_timestamp(PositiveTimestamp val) { - bindings.RawDataPart_set_timestamp(this.ptr, val == null ? 0 : val.ptr & ~1); - this.ptrs_to.add(val); + public void set_timestamp(org.ldk.structs.PositiveTimestamp val) { + bindings.RawDataPart_set_timestamp(this.ptr, val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); + if (this != null) { this.ptrs_to.add(val); }; } /** @@ -43,9 +47,21 @@ public class RawDataPart extends CommonBase { * This ignores pointers and is_owned flags and looks at the values in fields. * Two objects with NULL inner values will be considered "equal" here. */ - public boolean eq(RawDataPart b) { - boolean ret = bindings.RawDataPart_eq(this.ptr, b == null ? 0 : b.ptr & ~1); - this.ptrs_to.add(b); + public boolean eq(org.ldk.structs.RawDataPart b) { + boolean ret = bindings.RawDataPart_eq(this.ptr, b.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(b); + if (this != null) { this.ptrs_to.add(b); }; + return ret; + } + + @Override public boolean equals(Object o) { + if (!(o instanceof RawDataPart)) return false; + return this.eq((RawDataPart)o); + } + long clone_ptr() { + long ret = bindings.RawDataPart_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -54,10 +70,23 @@ public class RawDataPart extends CommonBase { */ public RawDataPart clone() { long ret = bindings.RawDataPart_clone(this.ptr); - if (ret < 1024) { return null; } - RawDataPart ret_hu_conv = new RawDataPart(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RawDataPart ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RawDataPart(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } + /** + * Generates a non-cryptographic 64-bit hash of the RawDataPart. + */ + public long hash() { + long ret = bindings.RawDataPart_hash(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + @Override public int hashCode() { + return (int)this.hash(); + } }