fix: switch back to default reward phase length for test

Author: brice-stacks

stacks-node/src/tests/nakamoto_integrations.rs

@@ -250,7 +250,7 @@ lazy_static! {
         // so any test that crosses it must first deploy the stub (see
         // `check_pox_5_stake_lifecycle` for the pattern). Tests that
         // *intentionally* exercise Epoch 4.0 override these heights — e.g.
-        // `epochs[Epoch34].end_height = 254; epochs[Epoch40].start_height = 254;`.
+        // `epochs[Epoch34].end_height = 260; epochs[Epoch40].start_height = 260;`.
         StacksEpoch {
             epoch_id: StacksEpochId::Epoch40,
             start_height: 1_000,
@@ -764,6 +764,9 @@ pub fn naka_neon_integration_conf(seed: Option<&[u8]>) -> (Config, StacksAddress
 
 /// Activate Epoch 4.0 (inactive by default in `NAKAMOTO_INTEGRATION_EPOCHS`).
 /// Must be applied to every node's config so peers agree on the boundary.
+///
+/// The boundary is placed at `260` — the start of cycle 13 under the default
+/// integration-test PoX params (`reward_length=20`)..
 pub fn enable_epoch_4_0(conf: &mut Config) {
     let epochs = conf
         .burnchain
@@ -773,11 +776,11 @@ pub fn enable_epoch_4_0(conf: &mut Config) {
     epochs
         .get_mut(StacksEpochId::Epoch34)
         .expect("Missing epoch 3.4 in config")
-        .end_height = 254;
+        .end_height = 260;
     epochs
         .get_mut(StacksEpochId::Epoch40)
         .expect("Missing epoch 4.0 in config")
-        .start_height = 254;
+        .start_height = 260;
 }
 
 pub fn next_block_and<F>(

stacks-node/src/tests/pox_5_integrations.rs

@@ -807,24 +807,13 @@ fn check_pox_5_register_for_second_bond_no_downtime() {
     let mut signers = TestSigners::default();
     let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
     enable_epoch_4_0(&mut naka_conf);
-    // Shorten the reward cycle so the 12-cycle mine from bond 0's start into
-    // bond 6's gap window stays tractable (~120 burn blocks vs ~240 at the
-    // 20-block default), then adjust as needed to meet requirements.
-    naka_conf.burnchain.pox_reward_length = Some(10);
-    naka_conf.burnchain.pox_prepare_length = Some(3);
-    {
-        let epochs = naka_conf.burnchain.epochs.as_mut().unwrap();
-        epochs[StacksEpochId::Epoch25].end_height = 225;
-        epochs[StacksEpochId::Epoch30].start_height = 225;
-    }
     let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
     naka_conf.burnchain.chain_id = CHAIN_ID_TESTNET + 1;
     let sender_sk = Secp256k1PrivateKey::random();
-    let sender_signer_sk = Secp256k1PrivateKey::random();
-    let sender_signer_addr = tests::to_addr(&sender_signer_sk);
-
     let signer_sk = signers.signer_keys[0].clone();
     let signer_pk = StacksPublicKey::from_private(&signer_sk);
+    let sender_signer_sk = signer_sk.clone();
+    let sender_signer_addr = tests::to_addr(&sender_signer_sk);
 
     let sender_addr = tests::to_addr(&sender_sk);
     let deploy_fee = 3000;