Merge pull request #5322 from stacks-network/chore/add-multiple-miners-with-custom-chain-id-test

jferrant · web-flow · commit faa96787cf34 · 2024-10-17T18:41:50.000Z
Add multiple_miners_with_custom_chain_id test to test chain id in a signer integration test
diff --git a/.github/workflows/bitcoin-tests.yml b/.github/workflows/bitcoin-tests.yml
@@ -119,6 +119,7 @@ jobs:
           - tests::signer::v0::signer_set_rollover
           - tests::signer::v0::signing_in_0th_tenure_of_reward_cycle
           - tests::signer::v0::continue_after_tenure_extend
+          - tests::signer::v0::multiple_miners_with_custom_chain_id
           - tests::nakamoto_integrations::burn_ops_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state
diff --git a/stacks-signer/src/config.rs b/stacks-signer/src/config.rs
@@ -156,7 +156,7 @@ pub struct GlobalConfig {
     /// How much time to wait for a miner to propose a block following a sortition
     pub block_proposal_timeout: Duration,
     /// An optional custom Chain ID
-    chain_id: Option<u32>,
+    pub chain_id: Option<u32>,
 }
 
 /// Internal struct for loading up the config file
diff --git a/testnet/stacks-node/src/tests/signer/v0.rs b/testnet/stacks-node/src/tests/signer/v0.rs

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ pub struct GlobalConfig {`
`156`	`156`	`/// How much time to wait for a miner to propose a block following a sortition`
`157`	`157`	`pub block_proposal_timeout: Duration,`
`158`	`158`	`/// An optional custom Chain ID`
`159`		`- chain_id: Option<u32>,`
	`159`	`+ pub chain_id: Option<u32>,`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`/// Internal struct for loading up the config file`