Skip to content

Commit 1c0dc20

Browse files
committed
Run cargo fmt-stacks
1 parent 42b7d62 commit 1c0dc20

File tree

11 files changed

+48
-30
lines changed

11 files changed

+48
-30
lines changed

testnet/stacks-node/src/tests/signer/commands/bitcoin_mining.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
use super::context::{SignerTestContext, SignerTestState};
2-
use crate::tests::signer::v0::{
3-
get_chain_info_wrapper, wait_for_block_pushed_by_miner_key, MultipleMinerTest,
4-
};
1+
use std::sync::{Arc, Mutex};
2+
53
use madhouse::{Command, CommandWrapper};
64
use proptest::prelude::{Just, Strategy};
75
use stacks::chainstate::stacks::TenureChangeCause;
8-
use std::sync::{Arc, Mutex};
96
use tracing::info;
107

8+
use super::context::{SignerTestContext, SignerTestState};
9+
use crate::tests::signer::v0::{
10+
get_chain_info_wrapper, wait_for_block_pushed_by_miner_key, MultipleMinerTest,
11+
};
12+
1113
pub struct MineBitcoinBlockTenureChangePrimaryMiner {
1214
miners: Arc<Mutex<MultipleMinerTest>>,
1315
}

testnet/stacks-node/src/tests/signer/commands/block_commit.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
use super::context::{SignerTestContext, SignerTestState};
2-
use crate::tests::signer::v0::MultipleMinerTest;
1+
use std::sync::{Arc, Mutex};
2+
33
use madhouse::{Command, CommandWrapper};
44
use proptest::prelude::{Just, Strategy};
5-
use std::sync::{Arc, Mutex};
5+
6+
use super::context::{SignerTestContext, SignerTestState};
7+
use crate::tests::signer::v0::MultipleMinerTest;
68

79
pub struct SubmitBlockCommitSecondaryMiner {
810
miners: Arc<Mutex<MultipleMinerTest>>,

testnet/stacks-node/src/tests/signer/commands/block_wait.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
use super::context::{SignerTestContext, SignerTestState};
2-
use crate::tests::signer::v0::{wait_for_block_pushed_by_miner_key, MultipleMinerTest};
1+
use std::sync::atomic::Ordering;
2+
use std::sync::{Arc, Mutex};
3+
34
use madhouse::{Command, CommandWrapper};
45
use proptest::prelude::{Just, Strategy};
5-
use std::sync::{atomic::Ordering, Arc, Mutex};
6+
7+
use super::context::{SignerTestContext, SignerTestState};
8+
use crate::tests::signer::v0::{wait_for_block_pushed_by_miner_key, MultipleMinerTest};
69

710
pub struct WaitForBlockFromMiner1 {
811
miners: Arc<Mutex<MultipleMinerTest>>,

testnet/stacks-node/src/tests/signer/commands/boot.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
use super::context::{SignerTestContext, SignerTestState};
2-
use crate::tests::signer::v0::{get_chain_info_wrapper, MultipleMinerTest};
1+
use std::sync::{Arc, Mutex};
2+
33
use madhouse::{Command, CommandWrapper};
44
use proptest::prelude::{Just, Strategy};
5-
use std::sync::{Arc, Mutex};
5+
6+
use super::context::{SignerTestContext, SignerTestState};
7+
use crate::tests::signer::v0::{get_chain_info_wrapper, MultipleMinerTest};
68

79
pub struct BootToEpoch3 {
810
miners: Arc<Mutex<MultipleMinerTest>>,

testnet/stacks-node/src/tests/signer/commands/commit_ops.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
use super::context::{SignerTestContext, SignerTestState};
1+
use std::sync::Arc;
2+
23
use madhouse::{Command, CommandWrapper};
34
use proptest::prelude::{Just, Strategy};
45
use stacks::util::tests::TestFlag;
5-
use std::sync::Arc;
6+
7+
use super::context::{SignerTestContext, SignerTestState};
68

79
pub struct SkipCommitOpPrimaryMiner {
810
miner_1_skip_commit_flag: TestFlag<bool>,

testnet/stacks-node/src/tests/signer/commands/context.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
use crate::tests::signer::v0::MultipleMinerTest;
2-
use madhouse::{State, TestContext};
31
use std::fmt::Debug;
42
use std::sync::{Arc, Mutex};
53
use std::time::Duration;
64

5+
use madhouse::{State, TestContext};
6+
7+
use crate::tests::signer::v0::MultipleMinerTest;
8+
79
#[derive(Clone)]
810
pub struct SignerTestContext {
911
pub miners: Arc<Mutex<MultipleMinerTest>>,

testnet/stacks-node/src/tests/signer/commands/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ mod sortition;
1010
mod stacks_mining;
1111
mod transfer;
1212

13-
pub use context::SignerTestContext;
14-
1513
pub use bitcoin_mining::MineBitcoinBlock;
1614
pub use block_commit::SubmitBlockCommitSecondaryMiner;
1715
pub use block_wait::{WaitForBlockFromMiner1, WaitForBlockFromMiner2};
1816
pub use boot::BootToEpoch3;
1917
pub use commit_ops::{SkipCommitOpPrimaryMiner, SkipCommitOpSecondaryMiner};
18+
pub use context::SignerTestContext;
2019
pub use shutdown::ShutdownMiners;
2120
pub use sortition::{
2221
VerifyLastSortitionWinnerReorged, VerifyMiner1WonSortition, VerifyMiner2WonSortition,

testnet/stacks-node/src/tests/signer/commands/shutdown.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
use super::context::{SignerTestContext, SignerTestState};
2-
use crate::tests::signer::v0::MultipleMinerTest;
1+
use std::sync::{Arc, Mutex};
2+
33
use madhouse::{Command, CommandWrapper};
44
use proptest::prelude::{Just, Strategy};
5-
use std::sync::{Arc, Mutex};
5+
6+
use super::context::{SignerTestContext, SignerTestState};
7+
use crate::tests::signer::v0::MultipleMinerTest;
68

79
pub struct ShutdownMiners {
810
miners: Arc<Mutex<MultipleMinerTest>>,

testnet/stacks-node/src/tests/signer/commands/sortition.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use std::sync::{Arc, Mutex};
33
use madhouse::{Command, CommandWrapper};
44
use proptest::prelude::{Just, Strategy};
55

6+
use super::context::SignerTestState;
7+
use super::SignerTestContext;
68
use crate::tests::signer::v0::{verify_sortition_winner, MultipleMinerTest};
79

8-
use super::{context::SignerTestState, SignerTestContext};
9-
1010
pub struct VerifyMiner1WonSortition {
1111
miners: Arc<Mutex<MultipleMinerTest>>,
1212
}

testnet/stacks-node/src/tests/signer/commands/stacks_mining.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use super::context::{SignerTestContext, SignerTestState};
1+
use std::sync::Arc;
2+
23
use madhouse::{Command, CommandWrapper};
34
use proptest::prelude::{Just, Strategy};
4-
use std::sync::Arc;
5+
6+
use super::context::{SignerTestContext, SignerTestState};
57

68
pub struct PauseStacksMining;
79

0 commit comments

Comments
 (0)