Skip to content

Commit be710a8

Browse files
none34829none34829
committed
chore(tests): replace deprecated FeeRate::from_sat_per_vb_unchecked
1 parent fbf803a commit be710a8

3 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎src/wallet/coin_selection.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ mod test {
939939
.coin_select(
940940
utxos,
941941
vec![],
942-
FeeRate::from_sat_per_vb_unchecked(1),
942+
FeeRate::from_sat_per_vb_u32(1),
943943
target_amount,
944944
&drain_script,
945945
&mut thread_rng(),
@@ -961,7 +961,7 @@ mod test {
961961
.coin_select(
962962
utxos,
963963
vec![],
964-
FeeRate::from_sat_per_vb_unchecked(1),
964+
FeeRate::from_sat_per_vb_u32(1),
965965
target_amount,
966966
&drain_script,
967967
&mut thread_rng(),
@@ -983,7 +983,7 @@ mod test {
983983
.coin_select(
984984
vec![],
985985
utxos,
986-
FeeRate::from_sat_per_vb_unchecked(1),
986+
FeeRate::from_sat_per_vb_u32(1),
987987
target_amount,
988988
&drain_script,
989989
&mut thread_rng(),
@@ -1004,7 +1004,7 @@ mod test {
10041004
let result = LargestFirstCoinSelection.coin_select(
10051005
vec![],
10061006
utxos,
1007-
FeeRate::from_sat_per_vb_unchecked(1),
1007+
FeeRate::from_sat_per_vb_u32(1),
10081008
target_amount,
10091009
&drain_script,
10101010
&mut thread_rng(),
@@ -1021,7 +1021,7 @@ mod test {
10211021
let result = LargestFirstCoinSelection.coin_select(
10221022
vec![],
10231023
utxos,
1024-
FeeRate::from_sat_per_vb_unchecked(1000),
1024+
FeeRate::from_sat_per_vb_u32(1000),
10251025
target_amount,
10261026
&drain_script,
10271027
&mut thread_rng(),
@@ -1039,7 +1039,7 @@ mod test {
10391039
.coin_select(
10401040
vec![],
10411041
utxos,
1042-
FeeRate::from_sat_per_vb_unchecked(1),
1042+
FeeRate::from_sat_per_vb_u32(1),
10431043
target_amount,
10441044
&drain_script,
10451045
&mut thread_rng(),
@@ -1061,7 +1061,7 @@ mod test {
10611061
.coin_select(
10621062
utxos,
10631063
vec![],
1064-
FeeRate::from_sat_per_vb_unchecked(1),
1064+
FeeRate::from_sat_per_vb_u32(1),
10651065
target_amount,
10661066
&drain_script,
10671067
&mut thread_rng(),
@@ -1085,7 +1085,7 @@ mod test {
10851085
.coin_select(
10861086
vec![],
10871087
all_utxos,
1088-
FeeRate::from_sat_per_vb_unchecked(1),
1088+
FeeRate::from_sat_per_vb_u32(1),
10891089
target_amount,
10901090
&drain_script,
10911091
&mut thread_rng(),
@@ -1110,7 +1110,7 @@ mod test {
11101110
.coin_select(
11111111
vec![],
11121112
all_utxos,
1113-
FeeRate::from_sat_per_vb_unchecked(1),
1113+
FeeRate::from_sat_per_vb_u32(1),
11141114
target_amount,
11151115
&drain_script,
11161116
&mut thread_rng(),
@@ -1136,7 +1136,7 @@ mod test {
11361136
.coin_select(
11371137
vec![],
11381138
utxos,
1139-
FeeRate::from_sat_per_vb_unchecked(1),
1139+
FeeRate::from_sat_per_vb_u32(1),
11401140
target_amount,
11411141
&drain_script,
11421142
&mut thread_rng(),
@@ -1157,7 +1157,7 @@ mod test {
11571157
let result = OldestFirstCoinSelection.coin_select(
11581158
vec![],
11591159
utxos,
1160-
FeeRate::from_sat_per_vb_unchecked(1),
1160+
FeeRate::from_sat_per_vb_u32(1),
11611161
target_amount,
11621162
&drain_script,
11631163
&mut thread_rng(),
@@ -1176,7 +1176,7 @@ mod test {
11761176
let result = OldestFirstCoinSelection.coin_select(
11771177
vec![],
11781178
utxos,
1179-
FeeRate::from_sat_per_vb_unchecked(1000),
1179+
FeeRate::from_sat_per_vb_u32(1000),
11801180
target_amount,
11811181
&drain_script,
11821182
&mut thread_rng(),
@@ -1196,7 +1196,7 @@ mod test {
11961196
.coin_select(
11971197
vec![],
11981198
utxos,
1199-
FeeRate::from_sat_per_vb_unchecked(1),
1199+
FeeRate::from_sat_per_vb_u32(1),
12001200
target_amount,
12011201
&drain_script,
12021202
&mut thread_rng(),
@@ -1218,7 +1218,7 @@ mod test {
12181218
.coin_select(
12191219
utxos.clone(),
12201220
utxos,
1221-
FeeRate::from_sat_per_vb_unchecked(1),
1221+
FeeRate::from_sat_per_vb_u32(1),
12221222
target_amount,
12231223
&drain_script,
12241224
&mut thread_rng(),
@@ -1260,7 +1260,7 @@ mod test {
12601260
let mut rng: StdRng = SeedableRng::from_seed(seed);
12611261
let mut utxos = generate_random_utxos(&mut rng, 300);
12621262
let target_amount = sum_random_utxos(&mut rng, &mut utxos) + FEE_AMOUNT;
1263-
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
1263+
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
12641264
let drain_script = ScriptBuf::default();
12651265

12661266
let result = SingleRandomDraw.coin_select(
@@ -1288,7 +1288,7 @@ mod test {
12881288
// 100_000, 10, 200_000
12891289
let utxos = get_test_utxos();
12901290
let target_amount = Amount::from_sat(300_000) + FEE_AMOUNT;
1291-
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
1291+
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
12921292
let drain_script = ScriptBuf::default();
12931293

12941294
let result = SingleRandomDraw.coin_select(
@@ -1361,7 +1361,7 @@ mod test {
13611361
let result = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
13621362
vec![],
13631363
utxos,
1364-
FeeRate::from_sat_per_vb_unchecked(1),
1364+
FeeRate::from_sat_per_vb_u32(1),
13651365
target_amount,
13661366
&drain_script,
13671367
&mut thread_rng(),
@@ -1379,7 +1379,7 @@ mod test {
13791379
let result = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
13801380
vec![],
13811381
utxos,
1382-
FeeRate::from_sat_per_vb_unchecked(1000),
1382+
FeeRate::from_sat_per_vb_u32(1000),
13831383
target_amount,
13841384
&drain_script,
13851385
&mut thread_rng(),
@@ -1440,7 +1440,7 @@ mod test {
14401440

14411441
#[test]
14421442
fn test_bnb_function_no_exact_match() {
1443-
let fee_rate = FeeRate::from_sat_per_vb_unchecked(10);
1443+
let fee_rate = FeeRate::from_sat_per_vb_u32(10);
14441444
let utxos: Vec<OutputGroup> = get_test_utxos()
14451445
.into_iter()
14461446
.map(|u| OutputGroup::new(u, fee_rate))
@@ -1472,7 +1472,7 @@ mod test {
14721472

14731473
#[test]
14741474
fn test_bnb_function_tries_exceeded() {
1475-
let fee_rate = FeeRate::from_sat_per_vb_unchecked(10);
1475+
let fee_rate = FeeRate::from_sat_per_vb_u32(10);
14761476
let utxos: Vec<OutputGroup> = generate_same_value_utxos(Amount::from_sat(100_000), 100_000)
14771477
.into_iter()
14781478
.map(|u| OutputGroup::new(u, fee_rate))
@@ -1506,7 +1506,7 @@ mod test {
15061506
// The match won't be exact but still in the range
15071507
#[test]
15081508
fn test_bnb_function_almost_exact_match_with_fees() {
1509-
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
1509+
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
15101510
let size_of_change = 31;
15111511
let cost_of_change = (Weight::from_vb_unchecked(size_of_change) * fee_rate)
15121512
.to_signed()
@@ -1597,7 +1597,7 @@ mod test {
15971597
let selection = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
15981598
vec![],
15991599
utxos,
1600-
FeeRate::from_sat_per_vb_unchecked(10),
1600+
FeeRate::from_sat_per_vb_u32(10),
16011601
Amount::from_sat(500_000),
16021602
&drain_script,
16031603
&mut thread_rng(),
@@ -1624,7 +1624,7 @@ mod test {
16241624
let selection = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
16251625
required,
16261626
optional,
1627-
FeeRate::from_sat_per_vb_unchecked(10),
1627+
FeeRate::from_sat_per_vb_u32(10),
16281628
Amount::from_sat(500_000),
16291629
&drain_script,
16301630
&mut thread_rng(),
@@ -1647,7 +1647,7 @@ mod test {
16471647
let selection = BranchAndBoundCoinSelection::<SingleRandomDraw>::default().coin_select(
16481648
utxos,
16491649
vec![],
1650-
FeeRate::from_sat_per_vb_unchecked(10_000),
1650+
FeeRate::from_sat_per_vb_u32(10_000),
16511651
Amount::from_sat(500_000),
16521652
&drain_script,
16531653
&mut thread_rng(),
@@ -1721,7 +1721,7 @@ mod test {
17211721
];
17221722

17231723
let optional = generate_same_value_utxos(Amount::from_sat(100_000), 30);
1724-
let fee_rate = FeeRate::from_sat_per_vb_unchecked(1);
1724+
let fee_rate = FeeRate::from_sat_per_vb_u32(1);
17251725
let target_amount = calc_target_amount(&optional[0..3], fee_rate);
17261726
assert_eq!(target_amount, Amount::from_sat(299_796));
17271727
let drain_script = ScriptBuf::default();

‎tests/build_fee_bump.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ fn test_bump_fee_drain_wallet() {
329329
let mut builder = wallet.build_fee_bump(txid).unwrap();
330330
builder
331331
.drain_wallet()
332-
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
332+
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
333333
let psbt = builder.finish().unwrap();
334334
let (sent, _received) =
335335
wallet.sent_and_received(&psbt.extract_tx().expect("failed to extract tx"));
@@ -391,7 +391,7 @@ fn test_bump_fee_remove_output_manually_selected_only() {
391391
let mut builder = wallet.build_fee_bump(txid).unwrap();
392392
builder
393393
.manually_selected_only()
394-
.fee_rate(FeeRate::from_sat_per_vb_unchecked(255));
394+
.fee_rate(FeeRate::from_sat_per_vb_u32(255));
395395
builder.finish().unwrap();
396396
}
397397

@@ -430,7 +430,7 @@ fn test_bump_fee_add_input() {
430430
insert_tx(&mut wallet, tx);
431431

432432
let mut builder = wallet.build_fee_bump(txid).unwrap();
433-
builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(50));
433+
builder.fee_rate(FeeRate::from_sat_per_vb_u32(50));
434434
let psbt = builder.finish().unwrap();
435435
let (sent, received) =
436436
wallet.sent_and_received(&psbt.clone().extract_tx().expect("failed to extract tx"));
@@ -458,7 +458,7 @@ fn test_bump_fee_add_input() {
458458
received
459459
);
460460

461-
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(50), @add_signature);
461+
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_u32(50), @add_signature);
462462
}
463463

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

572-
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(50), @add_signature);
572+
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_u32(50), @add_signature);
573573
}
574574

575575
#[test]
@@ -597,7 +597,7 @@ fn test_bump_fee_force_add_input() {
597597
builder
598598
.add_utxo(incoming_op)
599599
.unwrap()
600-
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
600+
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
601601
let psbt = builder.finish().unwrap();
602602
let (sent, received) =
603603
wallet.sent_and_received(&psbt.clone().extract_tx().expect("failed to extract tx"));
@@ -626,7 +626,7 @@ fn test_bump_fee_force_add_input() {
626626
received
627627
);
628628

629-
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(5), @add_signature);
629+
assert_fee_rate!(psbt, fee, FeeRate::from_sat_per_vb_u32(5), @add_signature);
630630
}
631631

632632
#[test]
@@ -715,7 +715,7 @@ fn test_bump_fee_unconfirmed_inputs_only() {
715715
}
716716
insert_tx(&mut wallet, tx);
717717
let mut builder = wallet.build_fee_bump(txid).unwrap();
718-
builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(25));
718+
builder.fee_rate(FeeRate::from_sat_per_vb_u32(25));
719719
builder.finish().unwrap();
720720
}
721721

@@ -746,7 +746,7 @@ fn test_bump_fee_unconfirmed_input() {
746746

747747
let mut builder = wallet.build_fee_bump(txid).unwrap();
748748
builder
749-
.fee_rate(FeeRate::from_sat_per_vb_unchecked(15))
749+
.fee_rate(FeeRate::from_sat_per_vb_u32(15))
750750
// remove original tx drain_to address and amount
751751
.set_recipients(Vec::new())
752752
// set back original drain_to address
@@ -823,7 +823,7 @@ fn test_legacy_bump_fee_drain_wallet() {
823823
let mut builder = wallet.build_fee_bump(txid).unwrap();
824824
builder
825825
.drain_wallet()
826-
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
826+
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
827827
let psbt = builder.finish().unwrap();
828828
let (sent, _received) =
829829
wallet.sent_and_received(&psbt.extract_tx().expect("failed to extract tx"));
@@ -866,7 +866,7 @@ fn test_legacy_bump_fee_add_input() {
866866
insert_tx(&mut wallet, tx);
867867

868868
let mut builder = wallet.build_fee_bump(txid).unwrap();
869-
builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(50));
869+
builder.fee_rate(FeeRate::from_sat_per_vb_u32(50));
870870
let psbt = builder.finish().unwrap();
871871
let (sent, received) =
872872
wallet.sent_and_received(&psbt.clone().extract_tx().expect("failed to extract tx"));
@@ -894,7 +894,7 @@ fn test_legacy_bump_fee_add_input() {
894894
received
895895
);
896896

897-
assert_fee_rate_legacy!(psbt, fee, FeeRate::from_sat_per_vb_unchecked(50), @add_signature);
897+
assert_fee_rate_legacy!(psbt, fee, FeeRate::from_sat_per_vb_u32(50), @add_signature);
898898
}
899899

900900
#[test]
@@ -971,7 +971,7 @@ fn test_bump_fee_pay_to_anchor_foreign_utxo() {
971971
.add_foreign_utxo(outpoint, psbt_input, satisfaction_weight)
972972
.unwrap()
973973
.only_witness_utxo()
974-
.fee_rate(FeeRate::from_sat_per_vb_unchecked(2))
974+
.fee_rate(FeeRate::from_sat_per_vb_u32(2))
975975
.drain_to(drain_spk.clone());
976976
let psbt = tx_builder.finish().unwrap();
977977
let tx = psbt.unsigned_tx.clone();
@@ -987,7 +987,7 @@ fn test_bump_fee_pay_to_anchor_foreign_utxo() {
987987
.set_recipients(vec![])
988988
.drain_to(drain_spk)
989989
.only_witness_utxo()
990-
.fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
990+
.fee_rate(FeeRate::from_sat_per_vb_u32(5));
991991
let psbt = tx_builder.finish().unwrap();
992992
let tx = &psbt.unsigned_tx;
993993
assert!(tx.input.iter().any(|txin| txin.previous_output == outpoint));

0 commit comments

Comments
 (0)