X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FRouteHintHop.java;h=119937c9b76f14d9d0fb169bc6313d7da71e7f3a;hb=8a515be62568ee4327e636a977e32204006d6493;hp=ad4a93b8ee1c9dce9a2b369a54490c482fe8f211;hpb=b0c50b891cbca28d3bd1d86276c132ff5221d8e4;p=ldk-java diff --git a/src/main/java/org/ldk/structs/RouteHintHop.java b/src/main/java/org/ldk/structs/RouteHintHop.java index ad4a93b8..119937c9 100644 --- a/src/main/java/org/ldk/structs/RouteHintHop.java +++ b/src/main/java/org/ldk/structs/RouteHintHop.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 RouteHintHop extends CommonBase { */ public byte[] get_src_node_id() { byte[] ret = bindings.RouteHintHop_get_src_node_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -30,7 +33,9 @@ public class RouteHintHop extends CommonBase { * The node_id of the non-target end of the route */ public void set_src_node_id(byte[] val) { - bindings.RouteHintHop_set_src_node_id(this.ptr, val); + bindings.RouteHintHop_set_src_node_id(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -38,6 +43,7 @@ public class RouteHintHop extends CommonBase { */ public long get_short_channel_id() { long ret = bindings.RouteHintHop_get_short_channel_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -46,6 +52,8 @@ public class RouteHintHop extends CommonBase { */ public void set_short_channel_id(long val) { bindings.RouteHintHop_set_short_channel_id(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -53,7 +61,9 @@ public class RouteHintHop extends CommonBase { */ public RoutingFees get_fees() { long ret = bindings.RouteHintHop_get_fees(this.ptr); - RoutingFees ret_hu_conv = new RoutingFees(null, ret); + 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); } ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -63,7 +73,8 @@ public class RouteHintHop extends CommonBase { */ public void set_fees(RoutingFees val) { bindings.RouteHintHop_set_fees(this.ptr, val == null ? 0 : val.ptr & ~1); - this.ptrs_to.add(val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -71,6 +82,7 @@ public class RouteHintHop extends CommonBase { */ public short get_cltv_expiry_delta() { short ret = bindings.RouteHintHop_get_cltv_expiry_delta(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -79,6 +91,8 @@ public class RouteHintHop extends CommonBase { */ public void set_cltv_expiry_delta(short val) { bindings.RouteHintHop_set_cltv_expiry_delta(this.ptr, val); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -86,7 +100,9 @@ public class RouteHintHop extends CommonBase { */ public Option_u64Z get_htlc_minimum_msat() { long ret = bindings.RouteHintHop_get_htlc_minimum_msat(this.ptr); - Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -96,6 +112,8 @@ public class RouteHintHop extends CommonBase { */ public void set_htlc_minimum_msat(Option_u64Z val) { bindings.RouteHintHop_set_htlc_minimum_msat(this.ptr, val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -103,7 +121,9 @@ public class RouteHintHop extends CommonBase { */ public Option_u64Z get_htlc_maximum_msat() { long ret = bindings.RouteHintHop_get_htlc_maximum_msat(this.ptr); - Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.Option_u64Z ret_hu_conv = org.ldk.structs.Option_u64Z.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } @@ -113,19 +133,57 @@ public class RouteHintHop extends CommonBase { */ public void set_htlc_maximum_msat(Option_u64Z val) { bindings.RouteHintHop_set_htlc_maximum_msat(this.ptr, val.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** * Constructs a new RouteHintHop given each field */ public static RouteHintHop of(byte[] src_node_id_arg, long short_channel_id_arg, RoutingFees fees_arg, short cltv_expiry_delta_arg, Option_u64Z htlc_minimum_msat_arg, Option_u64Z htlc_maximum_msat_arg) { - long ret = bindings.RouteHintHop_new(src_node_id_arg, short_channel_id_arg, fees_arg == null ? 0 : fees_arg.ptr & ~1, cltv_expiry_delta_arg, htlc_minimum_msat_arg.ptr, htlc_maximum_msat_arg.ptr); - RouteHintHop ret_hu_conv = new RouteHintHop(null, ret); + long ret = bindings.RouteHintHop_new(InternalUtils.check_arr_len(src_node_id_arg, 33), short_channel_id_arg, fees_arg == null ? 0 : fees_arg.ptr & ~1, cltv_expiry_delta_arg, htlc_minimum_msat_arg.ptr, htlc_maximum_msat_arg.ptr); + Reference.reachabilityFence(src_node_id_arg); + Reference.reachabilityFence(short_channel_id_arg); + Reference.reachabilityFence(fees_arg); + Reference.reachabilityFence(cltv_expiry_delta_arg); + Reference.reachabilityFence(htlc_minimum_msat_arg); + Reference.reachabilityFence(htlc_maximum_msat_arg); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RouteHintHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RouteHintHop(null, ret); } ret_hu_conv.ptrs_to.add(ret_hu_conv); - ret_hu_conv.ptrs_to.add(fees_arg); + return ret_hu_conv; + } + + long clone_ptr() { + long ret = bindings.RouteHintHop_clone_ptr(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + /** + * Creates a copy of the RouteHintHop + */ + public RouteHintHop clone() { + long ret = bindings.RouteHintHop_clone(this.ptr); + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } + org.ldk.structs.RouteHintHop ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.RouteHintHop(null, ret); } + ret_hu_conv.ptrs_to.add(this); return ret_hu_conv; } + /** + * Checks if two RouteHintHops contain equal inner contents. + */ + public long hash() { + long ret = bindings.RouteHintHop_hash(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + @Override public int hashCode() { + return (int)this.hash(); + } /** * Checks if two RouteHintHops contain equal inner contents. * This ignores pointers and is_owned flags and looks at the values in fields. @@ -133,17 +191,33 @@ public class RouteHintHop extends CommonBase { */ public boolean eq(RouteHintHop b) { boolean ret = bindings.RouteHintHop_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 RouteHintHop)) return false; + return this.eq((RouteHintHop)o); + } /** - * Creates a copy of the RouteHintHop + * Serialize the RouteHintHop object into a byte array which can be read by RouteHintHop_read */ - public RouteHintHop clone() { - long ret = bindings.RouteHintHop_clone(this.ptr); - RouteHintHop ret_hu_conv = new RouteHintHop(null, ret); - ret_hu_conv.ptrs_to.add(this); + public byte[] write() { + byte[] ret = bindings.RouteHintHop_write(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + /** + * Read a RouteHintHop from a byte array, created by RouteHintHop_write + */ + public static Result_RouteHintHopDecodeErrorZ read(byte[] ser) { + long ret = bindings.RouteHintHop_read(ser); + Reference.reachabilityFence(ser); + if (ret >= 0 && ret <= 4096) { return null; } + Result_RouteHintHopDecodeErrorZ ret_hu_conv = Result_RouteHintHopDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; }