Skip to content

Commit 5dfc57a

Browse files
ImplOfAnImplImplOfAnImpl
authored
Merge pull request #2058 from mintlayer/fix_rstest_trace_usage
Fix the usage of `#[trace]` attributes in `rstest`-based tests
2 parents 5ed9f09 + f60637b commit 5dfc57a

23 files changed

Lines changed: 64 additions & 139 deletions

File tree

‎api-server/stack-test-suite/tests/v2/orders.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ use common::chain::{
2121
use super::*;
2222

2323
#[rstest]
24-
#[trace]
2524
#[case(Seed::from_entropy(), OrdersVersion::V0)]
26-
#[trace]
2725
#[case(Seed::from_entropy(), OrdersVersion::V1)]
26+
#[trace]
2827
#[tokio::test]
2928
async fn create_fill_conclude_order(#[case] seed: Seed, #[case] version: OrdersVersion) {
3029
use common::chain::config::create_unit_test_config_builder;

‎chainstate/constraints-value-accumulator/src/tests/orders_constraints.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,9 @@ fn create_order_constraints(#[case] seed: Seed) {
254254
}
255255

256256
#[rstest]
257-
#[trace]
258257
#[case(Seed::from_entropy(), OrdersVersion::V0)]
259-
#[trace]
260258
#[case(Seed::from_entropy(), OrdersVersion::V1)]
259+
#[trace]
261260
fn fill_order_constraints(#[case] seed: Seed, #[case] version: OrdersVersion) {
262261
let mut rng = make_seedable_rng(seed);
263262

@@ -608,10 +607,9 @@ fn fill_order_constraints(#[case] seed: Seed, #[case] version: OrdersVersion) {
608607
}
609608

610609
#[rstest]
611-
#[trace]
612610
#[case(Seed::from_entropy(), OrdersVersion::V0)]
613-
#[trace]
614611
#[case(Seed::from_entropy(), OrdersVersion::V1)]
612+
#[trace]
615613
fn conclude_order_constraints(#[case] seed: Seed, #[case] version: OrdersVersion) {
616614
let mut rng = make_seedable_rng(seed);
617615

‎chainstate/test-suite/src/tests/data_deposit.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ use test_utils::random::{Seed, make_seedable_rng};
2929
use tx_verifier::CheckTransactionError;
3030

3131
#[rstest]
32-
#[trace]
3332
#[case(Seed::from_entropy(), true)]
34-
#[trace]
3533
#[case(Seed::from_entropy(), false)]
34+
#[trace]
3635
fn data_deposited_too_large(#[case] seed: Seed, #[case] expect_success: bool) {
3736
utils::concurrency::model(move || {
3837
let mut rng = make_seedable_rng(seed);
@@ -84,14 +83,11 @@ fn data_deposited_too_large(#[case] seed: Seed, #[case] expect_success: bool) {
8483
}
8584

8685
#[rstest]
87-
#[trace]
8886
#[case(Seed::from_entropy(), true, 1)]
89-
#[trace]
9087
#[case(Seed::from_entropy(), false, 1)]
91-
#[trace]
9288
#[case(Seed::from_entropy(), true, 2)]
93-
#[trace]
9489
#[case(Seed::from_entropy(), false, 2)]
90+
#[trace]
9591
fn data_deposit_insufficient_fee(
9692
#[case] seed: Seed,
9793
#[case] expect_success: bool,

‎chainstate/test-suite/src/tests/fungible_tokens_v1.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2575,10 +2575,9 @@ fn check_lockable_supply(#[case] seed: Seed) {
25752575
// Issue a token.
25762576
// Check that Unlimited and Fixed supplies cannot be locked.
25772577
#[rstest]
2578-
#[trace]
25792578
#[case(Seed::from_entropy(), TokenTotalSupply::Unlimited)]
2580-
#[trace]
25812579
#[case(Seed::from_entropy(), TokenTotalSupply::Fixed(Amount::from_atoms(1)))]
2580+
#[trace]
25822581
fn try_lock_not_lockable_supply(#[case] seed: Seed, #[case] supply: TokenTotalSupply) {
25832582
utils::concurrency::model(move || {
25842583
let mut rng = make_seedable_rng(seed);

‎chainstate/test-suite/src/tests/input_commitments.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,9 @@ fn pool_decommissioning(#[case] seed: Seed) {
298298
}
299299

300300
#[rstest]
301-
#[trace]
302301
#[case(Seed::from_entropy(), OrdersVersion::V0)]
303-
#[trace]
304302
#[case(Seed::from_entropy(), OrdersVersion::V1)]
303+
#[trace]
305304
fn order_fill(#[case] seed: Seed, #[case] orders_version: OrdersVersion) {
306305
let mut rng = make_seedable_rng(seed);
307306

@@ -585,10 +584,9 @@ fn order_fill(#[case] seed: Seed, #[case] orders_version: OrdersVersion) {
585584
}
586585

587586
#[rstest]
588-
#[trace]
589587
#[case(Seed::from_entropy(), OrdersVersion::V0)]
590-
#[trace]
591588
#[case(Seed::from_entropy(), OrdersVersion::V1)]
589+
#[trace]
592590
fn order_conclude(#[case] seed: Seed, #[case] orders_version: OrdersVersion) {
593591
let mut rng = make_seedable_rng(seed);
594592

‎chainstate/test-suite/src/tests/orders_tests.rs‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -732,10 +732,9 @@ fn create_order_tokens_for_tokens(#[case] seed: Seed) {
732732
}
733733

734734
#[rstest]
735-
#[trace]
736735
#[case(Seed::from_entropy(), OrdersVersion::V0)]
737-
#[trace]
738736
#[case(Seed::from_entropy(), OrdersVersion::V1)]
737+
#[trace]
739738
fn conclude_order_check_storage(#[case] seed: Seed, #[case] version: OrdersVersion) {
740739
utils::concurrency::model(move || {
741740
let mut rng = make_seedable_rng(seed);
@@ -822,10 +821,9 @@ fn conclude_order_check_storage(#[case] seed: Seed, #[case] version: OrdersVersi
822821
}
823822

824823
#[rstest]
825-
#[trace]
826824
#[case(Seed::from_entropy(), OrdersVersion::V0)]
827-
#[trace]
828825
#[case(Seed::from_entropy(), OrdersVersion::V1)]
826+
#[trace]
829827
fn conclude_order_multiple_txs(#[case] seed: Seed, #[case] version: OrdersVersion) {
830828
utils::concurrency::model(move || {
831829
let mut rng = make_seedable_rng(seed);
@@ -921,10 +919,9 @@ fn conclude_order_multiple_txs(#[case] seed: Seed, #[case] version: OrdersVersio
921919
}
922920

923921
#[rstest]
924-
#[trace]
925922
#[case(Seed::from_entropy(), OrdersVersion::V0)]
926-
#[trace]
927923
#[case(Seed::from_entropy(), OrdersVersion::V1)]
924+
#[trace]
928925
fn fill_order_check_storage(#[case] seed: Seed, #[case] version: OrdersVersion) {
929926
utils::concurrency::model(move || {
930927
let mut rng = make_seedable_rng(seed);
@@ -1061,10 +1058,9 @@ fn fill_order_check_storage(#[case] seed: Seed, #[case] version: OrdersVersion)
10611058
}
10621059

10631060
#[rstest]
1064-
#[trace]
10651061
#[case(Seed::from_entropy(), OrdersVersion::V0)]
1066-
#[trace]
10671062
#[case(Seed::from_entropy(), OrdersVersion::V1)]
1063+
#[trace]
10681064
fn fill_then_conclude(#[case] seed: Seed, #[case] version: OrdersVersion) {
10691065
utils::concurrency::model(move || {
10701066
let mut rng = make_seedable_rng(seed);
@@ -1283,10 +1279,9 @@ fn fill_then_conclude(#[case] seed: Seed, #[case] version: OrdersVersion) {
12831279
}
12841280

12851281
#[rstest]
1286-
#[trace]
12871282
#[case(Seed::from_entropy(), OrdersVersion::V0)]
1288-
#[trace]
12891283
#[case(Seed::from_entropy(), OrdersVersion::V1)]
1284+
#[trace]
12901285
fn try_overbid_order_in_multiple_txs(#[case] seed: Seed, #[case] version: OrdersVersion) {
12911286
utils::concurrency::model(move || {
12921287
let mut rng = make_seedable_rng(seed);
@@ -1396,10 +1391,9 @@ fn try_overbid_order_in_multiple_txs(#[case] seed: Seed, #[case] version: Orders
13961391
}
13971392

13981393
#[rstest]
1399-
#[trace]
14001394
#[case(Seed::from_entropy(), OrdersVersion::V0)]
1401-
#[trace]
14021395
#[case(Seed::from_entropy(), OrdersVersion::V1)]
1396+
#[trace]
14031397
fn fill_completely_then_conclude(#[case] seed: Seed, #[case] version: OrdersVersion) {
14041398
utils::concurrency::model(move || {
14051399
let mut rng = make_seedable_rng(seed);
@@ -1585,10 +1579,9 @@ fn fill_completely_then_conclude(#[case] seed: Seed, #[case] version: OrdersVers
15851579
}
15861580

15871581
#[rstest]
1588-
#[trace]
15891582
#[case(Seed::from_entropy(), OrdersVersion::V0)]
1590-
#[trace]
15911583
#[case(Seed::from_entropy(), OrdersVersion::V1)]
1584+
#[trace]
15921585
fn conclude_order_check_signature(#[case] seed: Seed, #[case] version: OrdersVersion) {
15931586
utils::concurrency::model(move || {
15941587
let mut rng = make_seedable_rng(seed);
@@ -1720,10 +1713,9 @@ fn conclude_order_check_signature(#[case] seed: Seed, #[case] version: OrdersVer
17201713
// Create a chain with an order which is filled partially.
17211714
// Reorg from a point before the order was created, so that after reorg storage has no information on the order
17221715
#[rstest]
1723-
#[trace]
17241716
#[case(Seed::from_entropy(), OrdersVersion::V0)]
1725-
#[trace]
17261717
#[case(Seed::from_entropy(), OrdersVersion::V1)]
1718+
#[trace]
17271719
fn reorg_before_create(#[case] seed: Seed, #[case] version: OrdersVersion) {
17281720
utils::concurrency::model(move || {
17291721
let mut rng = make_seedable_rng(seed);
@@ -1819,10 +1811,9 @@ fn reorg_before_create(#[case] seed: Seed, #[case] version: OrdersVersion) {
18191811
// Create a chain with an order which is filled partially or completely and then concluded.
18201812
// Reorg from a point after the order was created, so that after reorg storage has original information on the order
18211813
#[rstest]
1822-
#[trace]
18231814
#[case(Seed::from_entropy(), OrdersVersion::V0)]
1824-
#[trace]
18251815
#[case(Seed::from_entropy(), OrdersVersion::V1)]
1816+
#[trace]
18261817
fn reorg_after_create(#[case] seed: Seed, #[case] version: OrdersVersion) {
18271818
utils::concurrency::model(move || {
18281819
let mut rng = make_seedable_rng(seed);
@@ -2025,10 +2016,9 @@ fn test_activation(#[case] seed: Seed) {
20252016
}
20262017

20272018
#[rstest]
2028-
#[trace]
20292019
#[case(Seed::from_entropy(), OrdersVersion::V0)]
2030-
#[trace]
20312020
#[case(Seed::from_entropy(), OrdersVersion::V1)]
2021+
#[trace]
20322022
fn create_order_with_nft(#[case] seed: Seed, #[case] version: OrdersVersion) {
20332023
utils::concurrency::model(move || {
20342024
let mut rng = make_seedable_rng(seed);
@@ -2469,10 +2459,9 @@ fn partially_fill_order_with_nft_v1(#[case] seed: Seed) {
24692459
}
24702460

24712461
#[rstest]
2472-
#[trace]
24732462
#[case(Seed::from_entropy(), OrdersVersion::V0)]
2474-
#[trace]
24752463
#[case(Seed::from_entropy(), OrdersVersion::V1)]
2464+
#[trace]
24762465
fn fill_order_with_zero(#[case] seed: Seed, #[case] version: OrdersVersion) {
24772466
utils::concurrency::model(move || {
24782467
let mut rng = make_seedable_rng(seed);
@@ -2554,10 +2543,9 @@ fn fill_order_with_zero(#[case] seed: Seed, #[case] version: OrdersVersion) {
25542543
}
25552544

25562545
#[rstest]
2557-
#[trace]
25582546
#[case(Seed::from_entropy(), OrdersVersion::V0)]
2559-
#[trace]
25602547
#[case(Seed::from_entropy(), OrdersVersion::V1)]
2548+
#[trace]
25612549
fn fill_order_underbid(#[case] seed: Seed, #[case] version: OrdersVersion) {
25622550
utils::concurrency::model(move || {
25632551
use orders_accounting::calculate_filled_amount;
@@ -3064,10 +3052,9 @@ fn create_order_fill_activate_fork_fill_conclude(#[case] seed: Seed) {
30643052
}
30653053

30663054
#[rstest]
3067-
#[trace]
30683055
#[case(Seed::from_entropy(), OrdersVersion::V0)]
3069-
#[trace]
30703056
#[case(Seed::from_entropy(), OrdersVersion::V1)]
3057+
#[trace]
30713058
fn freeze_order_check_storage(#[case] seed: Seed, #[case] version: OrdersVersion) {
30723059
utils::concurrency::model(move || {
30733060
let mut rng = make_seedable_rng(seed);
@@ -3497,10 +3484,9 @@ fn fill_freeze_conclude_order(#[case] seed: Seed) {
34973484

34983485
// Orders with zero values are not allowed.
34993486
#[rstest]
3500-
#[trace]
35013487
#[case(Seed::from_entropy(), OrdersVersion::V0)]
3502-
#[trace]
35033488
#[case(Seed::from_entropy(), OrdersVersion::V1)]
3489+
#[trace]
35043490
fn order_with_zero_value(#[case] seed: Seed, #[case] version: OrdersVersion) {
35053491
utils::concurrency::model(move || {
35063492
let mut rng = make_seedable_rng(seed);
@@ -3943,10 +3929,9 @@ fn fill_order_v1_must_not_be_signed(#[case] seed: Seed) {
39433929
// it creates a block with 2 identical inputs among its transactions (which would normally be
39443930
// rejected with the DuplicateInputInBlock error, but v1 FillOrder inputs are an exception).
39453931
#[rstest]
3946-
#[trace]
39473932
#[case(Seed::from_entropy(), OrdersVersion::V0)]
3948-
#[trace]
39493933
#[case(Seed::from_entropy(), OrdersVersion::V1)]
3934+
#[trace]
39503935
fn fill_order_twice_in_same_block(
39513936
#[case] seed: Seed,
39523937
#[case] version: OrdersVersion,

‎chainstate/test-suite/src/tests/pos_accounting_reorg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ use test_utils::random::{Seed, make_seedable_rng};
4949
// Block `a` and block `c` have stake pool operation.
5050
// Check that after reorg all accounting data from block `a` was removed and from block `c` added to storage.
5151
#[rstest]
52-
#[trace]
5352
#[case(Seed::from_entropy(), NonZeroU64::new(1).unwrap(), 0)]
5453
#[case(Seed::from_entropy(), NonZeroU64::new(1).unwrap(), 1)]
5554
#[case(Seed::from_entropy(), NonZeroU64::new(1).unwrap(), 2)]
@@ -59,6 +58,7 @@ use test_utils::random::{Seed, make_seedable_rng};
5958
#[case(Seed::from_entropy(), NonZeroU64::new(3).unwrap(), 0)]
6059
#[case(Seed::from_entropy(), NonZeroU64::new(3).unwrap(), 1)]
6160
#[case(Seed::from_entropy(), NonZeroU64::new(3).unwrap(), 2)]
61+
#[trace]
6262
fn stake_pool_reorg(
6363
#[case] seed: Seed,
6464
#[case] epoch_length: NonZeroU64,

‎chainstate/test-suite/src/tests/signature_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,9 +499,9 @@ fn signed_classical_multisig_tx_missing_sigs(#[case] seed: Seed) {
499499
}
500500

501501
#[rstest]
502-
#[trace]
503502
#[case(Seed::from_entropy(), true)]
504503
#[case(Seed::from_entropy(), false)]
504+
#[trace]
505505
fn too_large_no_sig_data(#[case] seed: Seed, #[case] valid_size: bool) {
506506
utils::concurrency::model(move || {
507507
let mut rng = test_utils::random::make_seedable_rng(seed);
@@ -567,11 +567,11 @@ fn too_large_no_sig_data(#[case] seed: Seed, #[case] valid_size: bool) {
567567
}
568568

569569
#[rstest]
570-
#[trace]
571570
#[case(Seed::from_entropy(), true, true)]
572571
#[case(Seed::from_entropy(), true, false)]
573572
#[case(Seed::from_entropy(), false, true)]
574573
#[case(Seed::from_entropy(), false, false)]
574+
#[trace]
575575
fn no_sig_data_not_allowed(
576576
#[case] seed: Seed,
577577
#[case] data_allowed: bool,

‎chainstate/tx-verifier/src/transaction_verifier/reward_distribution.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -647,9 +647,9 @@ mod tests {
647647
// and that pool_b and its delegations were not affected.
648648
// Then undo everything and check that original state was restored.
649649
#[rstest]
650-
#[trace]
651650
#[case(Seed::from_entropy(), RewardDistributionVersion::V0)]
652651
#[case(Seed::from_entropy(), RewardDistributionVersion::V1)]
652+
#[trace]
653653
fn distribution_basic(#[case] seed: Seed, #[case] version: RewardDistributionVersion) {
654654
let mut rng = make_seedable_rng(seed);
655655
let block_id = Id::new(H256::random_using(&mut rng));
@@ -810,9 +810,9 @@ mod tests {
810810
// Create a pool with 2 delegations and random balances and reward.
811811
// Check distribution properties.
812812
#[rstest]
813-
#[trace]
814813
#[case(Seed::from_entropy(), RewardDistributionVersion::V0)]
815814
#[case(Seed::from_entropy(), RewardDistributionVersion::V1)]
815+
#[trace]
816816
fn distribution_properties(#[case] seed: Seed, #[case] version: RewardDistributionVersion) {
817817
let mut rng = make_seedable_rng(seed);
818818
let block_id = Id::new(H256::random_using(&mut rng));
@@ -959,9 +959,9 @@ mod tests {
959959

960960
// Check that if delegation is present but its balance is 0 then all the reward goes to staker
961961
#[rstest]
962-
#[trace]
963962
#[case(Seed::from_entropy(), RewardDistributionVersion::V0)]
964963
#[case(Seed::from_entropy(), RewardDistributionVersion::V1)]
964+
#[trace]
965965
fn total_delegations_balance_zero(
966966
#[case] seed: Seed,
967967
#[case] version: RewardDistributionVersion,
@@ -1034,9 +1034,9 @@ mod tests {
10341034

10351035
// Check that staker can set its reward to 100% and the reward goes entirely to the staker
10361036
#[rstest]
1037-
#[trace]
10381037
#[case(Seed::from_entropy(), RewardDistributionVersion::V0)]
10391038
#[case(Seed::from_entropy(), RewardDistributionVersion::V1)]
1039+
#[trace]
10401040
fn total_delegations_reward_zero(
10411041
#[case] seed: Seed,
10421042
#[case] version: RewardDistributionVersion,
@@ -1109,9 +1109,9 @@ mod tests {
11091109

11101110
// Check that if there are no delegations then the whole reward goes to the staker
11111111
#[rstest]
1112-
#[trace]
11131112
#[case(Seed::from_entropy(), RewardDistributionVersion::V0)]
11141113
#[case(Seed::from_entropy(), RewardDistributionVersion::V1)]
1114+
#[trace]
11151115
fn no_delegations(#[case] seed: Seed, #[case] version: RewardDistributionVersion) {
11161116
let mut rng = make_seedable_rng(seed);
11171117
let block_id = Id::new(H256::random_using(&mut rng));

‎consensus/src/pos/effective_pool_balance.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,9 @@ mod tests {
333333
}
334334

335335
#[rstest]
336-
#[trace]
337336
#[case(Seed::from_entropy(), Amount::from_atoms(600_000))]
338-
#[trace]
339337
#[case(Seed::from_entropy(), CoinUnit::from_coins(600_000_000).to_amount_atoms())]
338+
#[trace]
340339
fn calculate_effective_pool_balance_not_saturated(
341340
#[case] seed: Seed,
342341
#[case] final_supply: Amount,
@@ -358,10 +357,9 @@ mod tests {
358357
}
359358

360359
#[rstest]
361-
#[trace]
362360
#[case(Seed::from_entropy(), Amount::from_atoms(600_000))]
363-
#[trace]
364361
#[case(Seed::from_entropy(), CoinUnit::from_coins(600_000_000).to_amount_atoms())]
362+
#[trace]
365363
fn calculate_effective_balance_capped(#[case] seed: Seed, #[case] final_supply: Amount) {
366364
let mut rng = make_seedable_rng(seed);
367365

0 commit comments

Comments
 (0)