X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRoutingFees.java;h=1c0768518a00f41b5e92f50602559dec3cf7ba9e;hb=f385eff0dd0aa61fbf21ae946c424f4a6a26de04;hp=b3852453a432b4f1f53e5f481c28b189eb03d63a;hpb=b0c50b891cbca28d3bd1d86276c132ff5221d8e4;p=ldk-java diff --git a/src/main/java/org/ldk/structs/RoutingFees.java b/src/main/java/org/ldk/structs/RoutingFees.java index b3852453..1c076851 100644 --- a/src/main/java/org/ldk/structs/RoutingFees.java +++ b/src/main/java/org/ldk/structs/RoutingFees.java @@ -4,6 +4,8 @@ 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; /** @@ -23,6 +25,7 @@ public class RoutingFees extends CommonBase { */ public int get_base_msat() { int ret = bindings.RoutingFees_get_base_msat(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -31,6 +34,8 @@ public class RoutingFees extends CommonBase { */ public void set_base_msat(int val) { bindings.RoutingFees_set_base_msat(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -39,6 +44,7 @@ public class RoutingFees extends CommonBase { */ public int get_proportional_millionths() { int ret = bindings.RoutingFees_get_proportional_millionths(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -48,6 +54,8 @@ public class RoutingFees extends CommonBase { */ public void set_proportional_millionths(int val) { bindings.RoutingFees_set_proportional_millionths(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -55,8 +63,11 @@ public class RoutingFees extends CommonBase { */ public static RoutingFees of(int base_msat_arg, int proportional_millionths_arg) { long ret = bindings.RoutingFees_new(base_msat_arg, proportional_millionths_arg); - RoutingFees ret_hu_conv = new RoutingFees(null, ret); - ret_hu_conv.ptrs_to.add(ret_hu_conv); + Reference.reachabilityFence(base_msat_arg); + Reference.reachabilityFence(proportional_millionths_arg); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RoutingFees ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RoutingFees(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); }; return ret_hu_conv; } @@ -66,8 +77,20 @@ public class RoutingFees extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public boolean eq(RoutingFees b) { - boolean ret = bindings.RoutingFees_eq(this.ptr, b == null ? 0 : b.ptr & ~1); - this.ptrs_to.add(b); + boolean ret = bindings.RoutingFees_eq(this.ptr, b == null ? 0 : 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 RoutingFees)) return false; + return this.eq((RoutingFees)o); + } + long clone_ptr() { + long ret = bindings.RoutingFees_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -76,16 +99,31 @@ public class RoutingFees extends CommonBase { */ public RoutingFees clone() { long ret = bindings.RoutingFees_clone(this.ptr); - RoutingFees ret_hu_conv = new RoutingFees(null, ret); - ret_hu_conv.ptrs_to.add(this); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RoutingFees ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RoutingFees(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } + /** + * Checks if two RoutingFeess contain equal inner contents. + */ + public long hash() { + long ret = bindings.RoutingFees_hash(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + @Override public int hashCode() { + return (int)this.hash(); + } /** * Serialize the RoutingFees object into a byte array which can be read by RoutingFees_read */ public byte[] write() { byte[] ret = bindings.RoutingFees_write(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -94,6 +132,8 @@ public class RoutingFees extends CommonBase { */ public static Result_RoutingFeesDecodeErrorZ read(byte[] ser) { long ret = bindings.RoutingFees_read(ser); + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } Result_RoutingFeesDecodeErrorZ ret_hu_conv = Result_RoutingFeesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }