X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FScoreLookUp.java;h=022b74ec593466978c7fe9745904066364246d18;hb=2bb592fb946e316dba9f4d1123f8ac72ff4e9bf8;hp=f92f105b14c9f6eaa0f96fa948622f5bc57f4a14;hpb=519dc944de5b88f95975140a13fbc6d77dd15a95;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ScoreLookUp.java b/src/main/java/org/ldk/structs/ScoreLookUp.java index f92f105b..022b74ec 100644 --- a/src/main/java/org/ldk/structs/ScoreLookUp.java +++ b/src/main/java/org/ldk/structs/ScoreLookUp.java @@ -51,19 +51,18 @@ public class ScoreLookUp 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, ProbabilisticScoringFeeParameters score_params); + long channel_penalty_msat(CandidateRouteHop candidate, ChannelUsage usage, ProbabilisticScoringFeeParameters score_params); } private static class LDKScoreLookUpHolder { ScoreLookUp held; } public static ScoreLookUp new_impl(ScoreLookUpInterface arg) { final LDKScoreLookUpHolder impl_holder = new LDKScoreLookUpHolder(); impl_holder.held = new ScoreLookUp(new bindings.LDKScoreLookUp() { - @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); } + @Override public long channel_penalty_msat(long candidate, long usage, long score_params) { + CandidateRouteHop candidate_hu_conv = CandidateRouteHop.constr_from_ptr(candidate); org.ldk.structs.ChannelUsage usage_hu_conv = null; if (usage < 0 || usage > 4096) { usage_hu_conv = new org.ldk.structs.ChannelUsage(null, usage); } 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); + long ret = arg.channel_penalty_msat(candidate_hu_conv, usage_hu_conv, score_params_hu_conv); Reference.reachabilityFence(arg); return ret; } @@ -80,16 +79,12 @@ public class ScoreLookUp 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, org.ldk.structs.NodeId source, org.ldk.structs.NodeId target, org.ldk.structs.ChannelUsage usage, org.ldk.structs.ProbabilisticScoringFeeParameters score_params) { - long ret = bindings.ScoreLookUp_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); + public long channel_penalty_msat(org.ldk.structs.CandidateRouteHop candidate, org.ldk.structs.ChannelUsage usage, org.ldk.structs.ProbabilisticScoringFeeParameters score_params) { + long ret = bindings.ScoreLookUp_channel_penalty_msat(this.ptr, candidate == null ? 0 : candidate.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(candidate); Reference.reachabilityFence(usage); 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;