Skip to content

chore(tests): replace deprecated FeeRate::from_sat_per_vb_unchecked #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ValuedMammal merged 1 commit into from
Apr 23, 2026
+47 −47
Merged

chore(tests): replace deprecated FeeRate::from_sat_per_vb_unchecked #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/wallet/coin_selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ mod test {
.coin_select(
utxos,
vec![],
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -961,7 +961,7 @@ mod test {
.coin_select(
utxos,
vec![],
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -983,7 +983,7 @@ mod test {
.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1004,7 +1004,7 @@ mod test {
let result = LargestFirstCoinSelection.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1021,7 +1021,7 @@ mod test {
let result = LargestFirstCoinSelection.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1000),
FeeRate::from_sat_per_vb_u32(1000),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1039,7 +1039,7 @@ mod test {
.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1061,7 +1061,7 @@ mod test {
.coin_select(
utxos,
vec![],
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1085,7 +1085,7 @@ mod test {
.coin_select(
vec![],
all_utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1110,7 +1110,7 @@ mod test {
.coin_select(
vec![],
all_utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1136,7 +1136,7 @@ mod test {
.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1157,7 +1157,7 @@ mod test {
let result = OldestFirstCoinSelection.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1176,7 +1176,7 @@ mod test {
let result = OldestFirstCoinSelection.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1000),
FeeRate::from_sat_per_vb_u32(1000),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1196,7 +1196,7 @@ mod test {
.coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1218,7 +1218,7 @@ mod test {
.coin_select(
utxos.clone(),
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand Down Expand Up @@ -1260,7 +1260,7 @@ mod test {
let mut rng: StdRng = SeedableRng::from_seed(seed);
let mut utxos = generate_random_utxos(&mut rng, 300);
let target_amount = sum_random_utxos(&mut rng, &mut utxos) + FEE_AMOUNT;
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
let drain_script = ScriptBuf::default();

let result = SingleRandomDraw.coin_select(
Expand Down Expand Up @@ -1288,7 +1288,7 @@ mod test {
// 100_000, 10, 200_000
let utxos = get_test_utxos();
let target_amount = Amount::from_sat(300_000) + FEE_AMOUNT;
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
let drain_script = ScriptBuf::default();

let result = SingleRandomDraw.coin_select(
Expand Down Expand Up @@ -1361,7 +1361,7 @@ mod test {
let result = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1),
FeeRate::from_sat_per_vb_u32(1),
target_amount,
&drain_script,
&mut thread_rng(),
Expand All @@ -1379,7 +1379,7 @@ mod test {
let result = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(1000),
FeeRate::from_sat_per_vb_u32(1000),
target_amount,
&drain_script,
&mut thread_rng(),
Expand Down Expand Up @@ -1440,7 +1440,7 @@ mod test {

#[test]
fn test_bnb_function_no_exact_match() {
let fee_rate = FeeRate::from_sat_per_vb_unchecked(10);
let fee_rate = FeeRate::from_sat_per_vb_u32(10);
let utxos: Vec<OutputGroup> = get_test_utxos()
.into_iter()
.map(|u| OutputGroup::new(u, fee_rate))
Expand Down Expand Up @@ -1472,7 +1472,7 @@ mod test {

#[test]
fn test_bnb_function_tries_exceeded() {
let fee_rate = FeeRate::from_sat_per_vb_unchecked(10);
let fee_rate = FeeRate::from_sat_per_vb_u32(10);
let utxos: Vec<OutputGroup> = generate_same_value_utxos(Amount::from_sat(100_000), 100_000)
.into_iter()
.map(|u| OutputGroup::new(u, fee_rate))
Expand Down Expand Up @@ -1506,7 +1506,7 @@ mod test {
// The match won't be exact but still in the range
#[test]
fn test_bnb_function_almost_exact_match_with_fees() {
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
let size_of_change = 31;
let cost_of_change = (Weight::from_vb_unchecked(size_of_change) * fee_rate)
.to_signed()
Expand Down Expand Up @@ -1597,7 +1597,7 @@ mod test {
let selection = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
vec![],
utxos,
FeeRate::from_sat_per_vb_unchecked(10),
FeeRate::from_sat_per_vb_u32(10),
Amount::from_sat(500_000),
&drain_script,
&mut thread_rng(),
Expand All @@ -1624,7 +1624,7 @@ mod test {
let selection = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
required,
optional,
FeeRate::from_sat_per_vb_unchecked(10),
FeeRate::from_sat_per_vb_u32(10),
Amount::from_sat(500_000),
&drain_script,
&mut thread_rng(),
Expand All @@ -1647,7 +1647,7 @@ mod test {
let selection = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
utxos,
vec![],
FeeRate::from_sat_per_vb_unchecked(10_000),
FeeRate::from_sat_per_vb_u32(10_000),
Amount::from_sat(500_000),
&drain_script,
&mut thread_rng(),
Expand Down Expand Up @@ -1721,7 +1721,7 @@ mod test {
];

let optional = generate_same_value_utxos(Amount::from_sat(100_000), 30);
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
let target_amount = calc_target_amount(&optional[0..3], fee_rate);
assert_eq!(target_amount, Amount::from_sat(299_796));
let drain_script = ScriptBuf::default();
Expand Down
30 changes: 15 additions & 15 deletions tests/build_fee_bump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ fn test_bump_fee_drain_wallet() {
let mut builder = wallet.build_fee_bump(txid).unwrap();
builder
.drain_wallet()
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
let psbt = builder.finish().unwrap();
let (sent, _received) =
wallet.sent_and_received(&psbt.extract_tx().expect("failed to extract tx"));
Expand Down Expand Up @@ -391,7 +391,7 @@ fn test_bump_fee_remove_output_manually_selected_only() {
let mut builder = wallet.build_fee_bump(txid).unwrap();
builder
.manually_selected_only()
.fee_rate(FeeRate::from_sat_per_vb_unchecked(255));
.fee_rate(FeeRate::from_sat_per_vb_u32(255));
builder.finish().unwrap();
}

Expand Down Expand Up @@ -430,7 +430,7 @@ fn test_bump_fee_add_input() {
insert_tx(&mut wallet, tx);

let mut builder = wallet.build_fee_bump(txid).unwrap();
builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(50));
builder.fee_rate(FeeRate::from_sat_per_vb_u32(50));
let psbt = builder.finish().unwrap();
let (sent, received) =
wallet.sent_and_received(&psbt.clone().extract_tx().expect("failed to extract tx"));
Expand Down Expand Up @@ -458,7 +458,7 @@ fn test_bump_fee_add_input() {
received
);

assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(50), @add_signature);
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_u32(50), @add_signature);
}

#[test]
Expand Down Expand Up @@ -536,7 +536,7 @@ fn test_bump_fee_no_change_add_input_and_change() {
// Now bump the fees, the wallet should add an extra input and a change output, and leave
// the original output untouched.
let mut builder = wallet.build_fee_bump(txid).unwrap();
builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(50));
builder.fee_rate(FeeRate::from_sat_per_vb_u32(50));
let psbt = builder.finish().unwrap();
let (sent, received) =
wallet.sent_and_received(&psbt.clone().extract_tx().expect("failed to extract tx"));
Expand Down Expand Up @@ -569,7 +569,7 @@ fn test_bump_fee_no_change_add_input_and_change() {
Amount::from_sat(75_000) - original_send_all_amount - fee
);

assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(50), @add_signature);
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_u32(50), @add_signature);
}

#[test]
Expand Down Expand Up @@ -597,7 +597,7 @@ fn test_bump_fee_force_add_input() {
builder
.add_utxo(incoming_op)
.unwrap()
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
let psbt = builder.finish().unwrap();
let (sent, received) =
wallet.sent_and_received(&psbt.clone().extract_tx().expect("failed to extract tx"));
Expand Down Expand Up @@ -626,7 +626,7 @@ fn test_bump_fee_force_add_input() {
received
);

assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(5), @add_signature);
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_u32(5), @add_signature);
}

#[test]
Expand Down Expand Up @@ -715,7 +715,7 @@ fn test_bump_fee_unconfirmed_inputs_only() {
}
insert_tx(&mut wallet, tx);
let mut builder = wallet.build_fee_bump(txid).unwrap();
builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(25));
builder.fee_rate(FeeRate::from_sat_per_vb_u32(25));
builder.finish().unwrap();
}

Expand Down Expand Up @@ -746,7 +746,7 @@ fn test_bump_fee_unconfirmed_input() {

let mut builder = wallet.build_fee_bump(txid).unwrap();
builder
.fee_rate(FeeRate::from_sat_per_vb_unchecked(15))
.fee_rate(FeeRate::from_sat_per_vb_u32(15))
// remove original tx drain_to address and amount
.set_recipients(Vec::new())
// set back original drain_to address
Expand Down Expand Up @@ -823,7 +823,7 @@ fn test_legacy_bump_fee_drain_wallet() {
let mut builder = wallet.build_fee_bump(txid).unwrap();
builder
.drain_wallet()
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
let psbt = builder.finish().unwrap();
let (sent, _received) =
wallet.sent_and_received(&psbt.extract_tx().expect("failed to extract tx"));
Expand Down Expand Up @@ -866,7 +866,7 @@ fn test_legacy_bump_fee_add_input() {
insert_tx(&mut wallet, tx);

let mut builder = wallet.build_fee_bump(txid).unwrap();
builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(50));
builder.fee_rate(FeeRate::from_sat_per_vb_u32(50));
let psbt = builder.finish().unwrap();
let (sent, received) =
wallet.sent_and_received(&psbt.clone().extract_tx().expect("failed to extract tx"));
Expand Down Expand Up @@ -894,7 +894,7 @@ fn test_legacy_bump_fee_add_input() {
received
);

assert_fee_rate_legacy!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(50), @add_signature);
assert_fee_rate_legacy!(psbt, fee, FeeRate::from_sat_per_vb_u32(50), @add_signature);
}

#[test]
Expand Down Expand Up @@ -971,7 +971,7 @@ fn test_bump_fee_pay_to_anchor_foreign_utxo() {
.add_foreign_utxo(outpoint, psbt_input, satisfaction_weight)
.unwrap()
.only_witness_utxo()
.fee_rate(FeeRate::from_sat_per_vb_unchecked(2))
.fee_rate(FeeRate::from_sat_per_vb_u32(2))
.drain_to(drain_spk.clone());
let psbt = tx_builder.finish().unwrap();
let tx = psbt.unsigned_tx.clone();
Expand All @@ -987,7 +987,7 @@ fn test_bump_fee_pay_to_anchor_foreign_utxo() {
.set_recipients(vec![])
.drain_to(drain_spk)
.only_witness_utxo()
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
let psbt = tx_builder.finish().unwrap();
let tx = &psbt.unsigned_tx;
assert!(tx.input.iter().any(|txin| txin.previous_output == outpoint));
Expand Down
Loading