Skip to content

Commit 9e1cecd

Browse files
committed
Use ChangePolicy::min_value in lowest fee tests
If we only add a drain when it wouldn't increase waste then it is impossible to decrease waste by adding a new input -- but the logic of the bound function has to account for this situation. So by using min_value_and_waste we never test it!
1 parent 7360052 commit 9e1cecd

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

tests/lowest_fee.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ proptest! {
2626
) {
2727
let params = common::StrategyParams { n_candidates, target_value, base_weight, min_fee, feerate, feerate_lt_diff, drain_weight, drain_spend_weight, drain_dust };
2828
let candidates = common::gen_candidates(params.n_candidates);
29-
let change_policy = ChangePolicy::min_value_and_waste(params.drain_weights(), params.drain_dust, params.feerate(), params.long_term_feerate());
29+
let change_policy = ChangePolicy::min_value(params.drain_weights(), params.drain_dust);
3030
let metric = LowestFee { target: params.target(), long_term_feerate: params.long_term_feerate(), change_policy };
3131
common::can_eventually_find_best_solution(params, candidates, change_policy, metric)?;
3232
}
@@ -46,7 +46,7 @@ proptest! {
4646
) {
4747
let params = common::StrategyParams { n_candidates, target_value, base_weight, min_fee, feerate, feerate_lt_diff, drain_weight, drain_spend_weight, drain_dust };
4848
let candidates = common::gen_candidates(params.n_candidates);
49-
let change_policy = ChangePolicy::min_value_and_waste(params.drain_weights(), params.drain_dust, params.feerate(), params.long_term_feerate());
49+
let change_policy = ChangePolicy::min_value(params.drain_weights(), params.drain_dust);
5050
let metric = LowestFee { target: params.target(), long_term_feerate: params.long_term_feerate(), change_policy };
5151
common::ensure_bound_is_not_too_tight(params, candidates, change_policy, metric)?;
5252
}
@@ -90,11 +90,9 @@ proptest! {
9090

9191
let mut cs = CoinSelector::new(&candidates, params.base_weight);
9292

93-
let change_policy = ChangePolicy::min_value_and_waste(
93+
let change_policy = ChangePolicy::min_value(
9494
params.drain_weights(),
9595
params.drain_dust,
96-
params.feerate(),
97-
params.long_term_feerate(),
9896
);
9997

10098
let metric = LowestFee {
@@ -128,12 +126,7 @@ fn combined_changeless_metric() {
128126
let mut cs_a = CoinSelector::new(&candidates, params.base_weight);
129127
let mut cs_b = CoinSelector::new(&candidates, params.base_weight);
130128

131-
let change_policy = ChangePolicy::min_value_and_waste(
132-
params.drain_weights(),
133-
params.drain_dust,
134-
params.feerate(),
135-
params.long_term_feerate(),
136-
);
129+
let change_policy = ChangePolicy::min_value(params.drain_weights(), params.drain_dust);
137130

138131
let metric_lowest_fee = LowestFee {
139132
target: params.target(),

0 commit comments

Comments
 (0)