Skip to content

Commit 60ed0cf

Browse files
jferrantjferrant
committed
Make the ports random in the v0 tests
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent 1789dcc commit 60ed0cf

File tree

1 file changed

+41
-41
lines changed
  • testnet/stacks-node/src/tests/signer

1 file changed

+41
-41
lines changed

‎testnet/stacks-node/src/tests/signer/v0.rs

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ use crate::tests::neon_integrations::{
7878
get_account, get_chain_info, get_chain_info_opt, next_block_and_wait,
7979
run_until_burnchain_height, submit_tx, submit_tx_fallible, test_observer,
8080
};
81-
use crate::tests::{self, make_stacks_transfer};
81+
use crate::tests::{self, gen_random_port, make_stacks_transfer};
8282
use crate::{nakamoto_node, BitcoinRegtestController, BurnchainController, Config, Keychain};
8383

8484
impl SignerTest<SpawnedSigner> {
@@ -1449,10 +1449,10 @@ fn multiple_miners() {
14491449
let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
14501450
let btc_miner_2_pk = Keychain::default(btc_miner_2_seed.clone()).get_pub_key();
14511451

1452-
let node_1_rpc = 51024;
1453-
let node_1_p2p = 51023;
1454-
let node_2_rpc = 51026;
1455-
let node_2_p2p = 51025;
1452+
let node_1_rpc = gen_random_port();
1453+
let node_1_p2p = gen_random_port();
1454+
let node_2_rpc = gen_random_port();
1455+
let node_2_p2p = gen_random_port();
14561456

14571457
let localhost = "127.0.0.1";
14581458
let node_1_rpc_bind = format!("{localhost}:{node_1_rpc}");
@@ -1735,13 +1735,14 @@ fn miner_forking() {
17351735
let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
17361736
let btc_miner_2_pk = Keychain::default(btc_miner_2_seed.clone()).get_pub_key();
17371737

1738-
let node_1_rpc = 51024;
1739-
let node_1_p2p = 51023;
1740-
let node_2_rpc = 51026;
1741-
let node_2_p2p = 51025;
1738+
let node_1_rpc = gen_random_port();
1739+
let node_1_p2p = gen_random_port();
1740+
let node_2_rpc = gen_random_port();
1741+
let node_2_p2p = gen_random_port();
17421742

1743-
let node_1_rpc_bind = format!("127.0.0.1:{}", node_1_rpc);
1744-
let node_2_rpc_bind = format!("127.0.0.1:{}", node_2_rpc);
1743+
let localhost = "127.0.0.1";
1744+
let node_1_rpc_bind = format!("{localhost}:{node_1_rpc}");
1745+
let node_2_rpc_bind = format!("{localhost}:{node_2_rpc}");
17451746
let mut node_2_listeners = Vec::new();
17461747

17471748
// partition the signer set so that ~half are listening and using node 1 for RPC and events,
@@ -1764,11 +1765,10 @@ fn miner_forking() {
17641765
Duration::from_secs(first_proposal_burn_block_timing);
17651766
},
17661767
|config| {
1767-
let localhost = "127.0.0.1";
1768-
config.node.rpc_bind = format!("{}:{}", localhost, node_1_rpc);
1769-
config.node.p2p_bind = format!("{}:{}", localhost, node_1_p2p);
1770-
config.node.data_url = format!("http://{}:{}", localhost, node_1_rpc);
1771-
config.node.p2p_address = format!("{}:{}", localhost, node_1_p2p);
1768+
config.node.rpc_bind = format!("{localhost}:{node_1_rpc}");
1769+
config.node.p2p_bind = format!("{localhost}:{node_1_p2p}");
1770+
config.node.data_url = format!("http://{localhost}:{node_1_rpc}");
1771+
config.node.p2p_address = format!("{localhost}:{node_1_p2p}");
17721772

17731773
config.node.seed = btc_miner_1_seed.clone();
17741774
config.node.local_peer_seed = btc_miner_1_seed.clone();
@@ -2744,13 +2744,14 @@ fn multiple_miners_mock_sign_epoch_25() {
27442744
let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
27452745
let btc_miner_2_pk = Keychain::default(btc_miner_2_seed.clone()).get_pub_key();
27462746

2747-
let node_1_rpc = 51024;
2748-
let node_1_p2p = 51023;
2749-
let node_2_rpc = 51026;
2750-
let node_2_p2p = 51025;
2747+
let node_1_rpc = gen_random_port();
2748+
let node_1_p2p = gen_random_port();
2749+
let node_2_rpc = gen_random_port();
2750+
let node_2_p2p = gen_random_port();
27512751

2752-
let node_1_rpc_bind = format!("127.0.0.1:{}", node_1_rpc);
2753-
let node_2_rpc_bind = format!("127.0.0.1:{}", node_2_rpc);
2752+
let localhost = "127.0.0.1";
2753+
let node_1_rpc_bind = format!("{localhost}:{node_1_rpc}");
2754+
let node_2_rpc_bind = format!("{localhost}:{node_2_rpc}");
27542755
let mut node_2_listeners = Vec::new();
27552756

27562757
// partition the signer set so that ~half are listening and using node 1 for RPC and events,
@@ -2768,11 +2769,10 @@ fn multiple_miners_mock_sign_epoch_25() {
27682769
signer_config.node_host = node_host.to_string();
27692770
},
27702771
|config| {
2771-
let localhost = "127.0.0.1";
2772-
config.node.rpc_bind = format!("{}:{}", localhost, node_1_rpc);
2773-
config.node.p2p_bind = format!("{}:{}", localhost, node_1_p2p);
2774-
config.node.data_url = format!("http://{}:{}", localhost, node_1_rpc);
2775-
config.node.p2p_address = format!("{}:{}", localhost, node_1_p2p);
2772+
config.node.rpc_bind = format!("{localhost}:{node_1_rpc}");
2773+
config.node.p2p_bind = format!("{localhost}:{node_1_p2p}");
2774+
config.node.data_url = format!("http://{localhost}:{node_1_rpc}");
2775+
config.node.p2p_address = format!("{localhost}:{node_1_p2p}");
27762776

27772777
config.node.seed = btc_miner_1_seed.clone();
27782778
config.node.local_peer_seed = btc_miner_1_seed.clone();
@@ -3469,10 +3469,10 @@ fn multiple_miners_with_nakamoto_blocks() {
34693469
let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
34703470
let btc_miner_2_pk = Keychain::default(btc_miner_2_seed.clone()).get_pub_key();
34713471

3472-
let node_1_rpc = 51024;
3473-
let node_1_p2p = 51023;
3474-
let node_2_rpc = 51026;
3475-
let node_2_p2p = 51025;
3472+
let node_1_rpc = gen_random_port();
3473+
let node_1_p2p = gen_random_port();
3474+
let node_2_rpc = gen_random_port();
3475+
let node_2_p2p = gen_random_port();
34763476

34773477
let localhost = "127.0.0.1";
34783478
let node_1_rpc_bind = format!("{localhost}:{node_1_rpc}");
@@ -3746,14 +3746,14 @@ fn partial_tenure_fork() {
37463746
let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
37473747
let btc_miner_2_pk = Keychain::default(btc_miner_2_seed.clone()).get_pub_key();
37483748

3749-
let node_1_rpc = 51024;
3750-
let node_1_p2p = 51023;
3751-
let node_2_rpc = 51026;
3752-
let node_2_p2p = 51025;
3753-
3754-
let node_1_rpc_bind = format!("127.0.0.1:{}", node_1_rpc);
3749+
let node_1_rpc = gen_random_port();
3750+
let node_1_p2p = gen_random_port();
3751+
let node_2_rpc = gen_random_port();
3752+
let node_2_p2p = gen_random_port();
37553753

37563754
let localhost = "127.0.0.1";
3755+
let node_1_rpc_bind = format!("{localhost}:{node_1_rpc}");
3756+
37573757
// All signers are listening to node 1
37583758
let mut signer_test: SignerTest<SpawnedSigner> = SignerTest::new_with_config_modifications(
37593759
num_signers,
@@ -5193,10 +5193,10 @@ fn multiple_miners_with_custom_chain_id() {
51935193
let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
51945194
let btc_miner_2_pk = Keychain::default(btc_miner_2_seed.clone()).get_pub_key();
51955195

5196-
let node_1_rpc = 51024;
5197-
let node_1_p2p = 51023;
5198-
let node_2_rpc = 51026;
5199-
let node_2_p2p = 51025;
5196+
let node_1_rpc = gen_random_port();
5197+
let node_1_p2p = gen_random_port();
5198+
let node_2_rpc = gen_random_port();
5199+
let node_2_p2p = gen_random_port();
52005200

52015201
let localhost = "127.0.0.1";
52025202
let node_1_rpc_bind = format!("{localhost}:{node_1_rpc}");

0 commit comments

Comments
 (0)