X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FScore.java;h=e991a6d75589d4ca7dfc67b7a084e9603ef51bc3;hb=8fa2bcb208a51fa352d04981f1387d8bceced107;hp=347edf6a216a667260df941ad19deff156f67b2d;hpb=8f5edad2f310a130b658e1b530fe2516724c4d99;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Score.java b/src/main/java/org/ldk/structs/Score.java index 347edf6a..e991a6d7 100644 --- a/src/main/java/org/ldk/structs/Score.java +++ b/src/main/java/org/ldk/structs/Score.java @@ -25,7 +25,19 @@ public class Score extends CommonBase { protected void finalize() throws Throwable { if (ptr != 0) { bindings.Score_free(ptr); } super.finalize(); } - + /** + * Destroys the object, freeing associated resources. After this call, any access + * to this object may result in a SEGFAULT or worse. + * + * You should generally NEVER call this method. You should let the garbage collector + * do this for you when it finalizes objects. However, it may be useful for types + * which represent locks and should be closed immediately to avoid holding locks + * until the GC runs. + */ + public void destroy() { + if (ptr != 0) { bindings.Score_free(ptr); } + ptr = 0; + } public static interface ScoreInterface { /** * Returns the fee in msats willing to be paid to avoid routing `send_amt_msat` through the @@ -37,23 +49,23 @@ public class Score extends CommonBase { * [`u64::max_value`] is given to indicate sufficient capacity for the invoice's full amount. * Thus, implementations should be overflow-safe. */ - long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target, ChannelUsage usage); + long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target, ChannelUsage usage, ProbabilisticScoringFeeParameters score_params); /** * Handles updating channel penalties after failing to route through a channel. */ - void payment_path_failed(RouteHop[] path, long short_channel_id); + void payment_path_failed(Path path, long short_channel_id); /** * Handles updating channel penalties after successfully routing along a path. */ - void payment_path_successful(RouteHop[] path); + void payment_path_successful(Path path); /** * Handles updating channel penalties after a probe over the given path failed. */ - void probe_failed(RouteHop[] path, long short_channel_id); + void probe_failed(Path path, long short_channel_id); /** * Handles updating channel penalties after a probe over the given path succeeded. */ - void probe_successful(RouteHop[] path); + void probe_successful(Path path); /** * Serialize the object into a byte array */ @@ -63,61 +75,34 @@ public class Score extends CommonBase { public static Score new_impl(ScoreInterface arg) { final LDKScoreHolder impl_holder = new LDKScoreHolder(); impl_holder.held = new Score(new bindings.LDKScore() { - @Override public long channel_penalty_msat(long short_channel_id, long source, long target, long usage) { + @Override public long channel_penalty_msat(long short_channel_id, long source, long target, long usage, long score_params) { org.ldk.structs.NodeId source_hu_conv = null; if (source < 0 || source > 4096) { source_hu_conv = new org.ldk.structs.NodeId(null, source); } org.ldk.structs.NodeId target_hu_conv = null; if (target < 0 || target > 4096) { target_hu_conv = new org.ldk.structs.NodeId(null, target); } org.ldk.structs.ChannelUsage usage_hu_conv = null; if (usage < 0 || usage > 4096) { usage_hu_conv = new org.ldk.structs.ChannelUsage(null, usage); } - usage_hu_conv.ptrs_to.add(this); - long ret = arg.channel_penalty_msat(short_channel_id, source_hu_conv, target_hu_conv, usage_hu_conv); + if (usage_hu_conv != null) { usage_hu_conv.ptrs_to.add(this); }; + org.ldk.structs.ProbabilisticScoringFeeParameters score_params_hu_conv = null; if (score_params < 0 || score_params > 4096) { score_params_hu_conv = new org.ldk.structs.ProbabilisticScoringFeeParameters(null, score_params); } + long ret = arg.channel_penalty_msat(short_channel_id, source_hu_conv, target_hu_conv, usage_hu_conv, score_params_hu_conv); Reference.reachabilityFence(arg); return ret; } - @Override public void payment_path_failed(long[] path, long short_channel_id) { - int path_conv_10_len = path.length; - RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len]; - for (int k = 0; k < path_conv_10_len; k++) { - long path_conv_10 = path[k]; - org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); } - path_conv_10_hu_conv.ptrs_to.add(this); - path_conv_10_arr[k] = path_conv_10_hu_conv; - } - arg.payment_path_failed(path_conv_10_arr, short_channel_id); + @Override public void payment_path_failed(long path, long short_channel_id) { + org.ldk.structs.Path path_hu_conv = null; if (path < 0 || path > 4096) { path_hu_conv = new org.ldk.structs.Path(null, path); } + arg.payment_path_failed(path_hu_conv, short_channel_id); Reference.reachabilityFence(arg); } - @Override public void payment_path_successful(long[] path) { - int path_conv_10_len = path.length; - RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len]; - for (int k = 0; k < path_conv_10_len; k++) { - long path_conv_10 = path[k]; - org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); } - path_conv_10_hu_conv.ptrs_to.add(this); - path_conv_10_arr[k] = path_conv_10_hu_conv; - } - arg.payment_path_successful(path_conv_10_arr); + @Override public void payment_path_successful(long path) { + org.ldk.structs.Path path_hu_conv = null; if (path < 0 || path > 4096) { path_hu_conv = new org.ldk.structs.Path(null, path); } + arg.payment_path_successful(path_hu_conv); Reference.reachabilityFence(arg); } - @Override public void probe_failed(long[] path, long short_channel_id) { - int path_conv_10_len = path.length; - RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len]; - for (int k = 0; k < path_conv_10_len; k++) { - long path_conv_10 = path[k]; - org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); } - path_conv_10_hu_conv.ptrs_to.add(this); - path_conv_10_arr[k] = path_conv_10_hu_conv; - } - arg.probe_failed(path_conv_10_arr, short_channel_id); + @Override public void probe_failed(long path, long short_channel_id) { + org.ldk.structs.Path path_hu_conv = null; if (path < 0 || path > 4096) { path_hu_conv = new org.ldk.structs.Path(null, path); } + arg.probe_failed(path_hu_conv, short_channel_id); Reference.reachabilityFence(arg); } - @Override public void probe_successful(long[] path) { - int path_conv_10_len = path.length; - RouteHop[] path_conv_10_arr = new RouteHop[path_conv_10_len]; - for (int k = 0; k < path_conv_10_len; k++) { - long path_conv_10 = path[k]; - org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); } - path_conv_10_hu_conv.ptrs_to.add(this); - path_conv_10_arr[k] = path_conv_10_hu_conv; - } - arg.probe_successful(path_conv_10_arr); + @Override public void probe_successful(long path) { + org.ldk.structs.Path path_hu_conv = null; if (path < 0 || path > 4096) { path_hu_conv = new org.ldk.structs.Path(null, path); } + arg.probe_successful(path_hu_conv); Reference.reachabilityFence(arg); } @Override public byte[] write() { @@ -138,54 +123,61 @@ public class Score extends CommonBase { * [`u64::max_value`] is given to indicate sufficient capacity for the invoice's full amount. * Thus, implementations should be overflow-safe. */ - public long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target, ChannelUsage usage) { - long ret = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, source == null ? 0 : source.ptr & ~1, target == null ? 0 : target.ptr & ~1, usage == null ? 0 : usage.ptr & ~1); + public long channel_penalty_msat(long short_channel_id, org.ldk.structs.NodeId source, org.ldk.structs.NodeId target, org.ldk.structs.ChannelUsage usage, org.ldk.structs.ProbabilisticScoringFeeParameters score_params) { + long ret = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, source == null ? 0 : source.ptr, target == null ? 0 : target.ptr, usage == null ? 0 : usage.ptr, score_params == null ? 0 : score_params.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(short_channel_id); Reference.reachabilityFence(source); Reference.reachabilityFence(target); Reference.reachabilityFence(usage); - this.ptrs_to.add(source); - this.ptrs_to.add(target); + Reference.reachabilityFence(score_params); + if (this != null) { this.ptrs_to.add(source); }; + if (this != null) { this.ptrs_to.add(target); }; + if (this != null) { this.ptrs_to.add(usage); }; + if (this != null) { this.ptrs_to.add(score_params); }; return ret; } /** * Handles updating channel penalties after failing to route through a channel. */ - public void payment_path_failed(RouteHop[] path, long short_channel_id) { - bindings.Score_payment_path_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null, short_channel_id); + public void payment_path_failed(org.ldk.structs.Path path, long short_channel_id) { + bindings.Score_payment_path_failed(this.ptr, path == null ? 0 : path.ptr, short_channel_id); Reference.reachabilityFence(this); Reference.reachabilityFence(path); Reference.reachabilityFence(short_channel_id); + if (this != null) { this.ptrs_to.add(path); }; } /** * Handles updating channel penalties after successfully routing along a path. */ - public void payment_path_successful(RouteHop[] path) { - bindings.Score_payment_path_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null); + public void payment_path_successful(org.ldk.structs.Path path) { + bindings.Score_payment_path_successful(this.ptr, path == null ? 0 : path.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(path); + if (this != null) { this.ptrs_to.add(path); }; } /** * Handles updating channel penalties after a probe over the given path failed. */ - public void probe_failed(RouteHop[] path, long short_channel_id) { - bindings.Score_probe_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null, short_channel_id); + public void probe_failed(org.ldk.structs.Path path, long short_channel_id) { + bindings.Score_probe_failed(this.ptr, path == null ? 0 : path.ptr, short_channel_id); Reference.reachabilityFence(this); Reference.reachabilityFence(path); Reference.reachabilityFence(short_channel_id); + if (this != null) { this.ptrs_to.add(path); }; } /** * Handles updating channel penalties after a probe over the given path succeeded. */ - public void probe_successful(RouteHop[] path) { - bindings.Score_probe_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null); + public void probe_successful(org.ldk.structs.Path path) { + bindings.Score_probe_successful(this.ptr, path == null ? 0 : path.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(path); + if (this != null) { this.ptrs_to.add(path); }; } /**