test: reuse stackers from pox-4 as pox-5 stx-only stakers in epoch_4_0 e2e tests

Author: aaronb-stacks

stacks-node/src/tests/signer/v0/epoch_4_0_multi_miner_distribution.rs

@@ -54,7 +54,7 @@ use stacks::core::{StacksEpochId, STACKS_EPOCH_MAX};
 use stacks::types::chainstate::StacksPrivateKey;
 use stacks::util::secp256k1::Secp256k1PublicKey;
 
-use super::{pox5_staker_initial_balances, pox5_staker_keys, MultipleMinerTest};
+use super::MultipleMinerTest;
 use crate::tests::nakamoto_integrations::enable_epoch_4_0;
 use crate::tests::neon_integrations::test_observer;
 use crate::tests::to_addr;
@@ -89,12 +89,8 @@ fn epoch_4_0_burn_distribution_chains_across_boundary() {
     }
 
     let num_signers = 5;
-    let seed = "epoch_4_0_multi_miner";
     let stake_amount: u128 = 100_000_000_000;
     let lock_cycles: u128 = 12;
-    let stakers = pox5_staker_keys(num_signers, seed);
-    let per_staker_balance: u64 = u64::try_from(stake_amount).unwrap() + 1_000_000;
-    let staker_balances = pox5_staker_initial_balances(num_signers, seed, per_staker_balance);
 
     let agg_pubkey: [u8; 33] = Secp256k1PublicKey::from_private(&StacksPrivateKey::from_seed(
         b"epoch-4-0-multi-miner-agg",
@@ -119,7 +115,6 @@ fn epoch_4_0_burn_distribution_chains_across_boundary() {
     let publisher_addr_str = publisher_addr.to_string();
     let token_contract_id_modifier = token_contract_id.clone();
     let registry_contract_id_modifier = registry_contract_id.clone();
-    let staker_balances_modifier = staker_balances.clone();
 
     let mut miners = MultipleMinerTest::new_with_config_modifications(
         num_signers,
@@ -132,9 +127,6 @@ fn epoch_4_0_burn_distribution_chains_across_boundary() {
             node_config.node.pox_5_sbtc_registry_contract =
                 Some(registry_contract_id_modifier.clone());
             node_config.add_initial_balance(publisher_addr_str.clone(), 1_000_000);
-            for (addr, balance) in staker_balances_modifier.iter() {
-                node_config.add_initial_balance(addr.to_string(), *balance);
-            }
             enable_epoch_4_0(node_config);
         },
         |node_config| {
@@ -161,7 +153,6 @@ fn epoch_4_0_burn_distribution_chains_across_boundary() {
         token_contract_name,
         registry_contract_name,
         &agg_pubkey,
-        &stakers,
         stake_amount,
         lock_cycles,
     );

stacks-node/src/tests/signer/v0/epoch_4_0_waterfall.rs

@@ -39,7 +39,7 @@ use stacks::util_lib::boot::boot_code_id;
 use stacks_common::deps_common::bitcoin::blockdata::transaction::Transaction as BitcoinTransaction;
 use stacks_signer::v0::SpawnedSigner;
 
-use super::{pox5_staker_initial_balances, pox5_staker_keys, SignerTest};
+use super::SignerTest;
 use crate::tests::nakamoto_integrations::{enable_epoch_4_0, wait_for};
 use crate::tests::neon_integrations::{get_chain_info, next_block_and_wait};
 use crate::tests::to_addr;
@@ -94,11 +94,8 @@ fn epoch_4_0_block_commit_uses_single_sbtc_output() {
     }
 
     let num_signers = 5;
-    let seed = "epoch_4_0_basic";
     let stake_amount: u128 = 100_000_000_000;
     let lock_cycles: u128 = 12;
-    let stakers = pox5_staker_keys(num_signers, seed);
-    let per_staker_balance: u64 = u64::try_from(stake_amount).unwrap() + 1_000_000;
 
     let agg_pubkey: [u8; 33] =
         Secp256k1PublicKey::from_private(&StacksPrivateKey::from_seed(b"epoch-4-0-waterfall-agg"))
@@ -119,12 +116,7 @@ fn epoch_4_0_block_commit_uses_single_sbtc_output() {
         ContractName::try_from(registry_contract_name.to_string()).expect("valid contract name"),
     );
 
-    let mut initial_balances = vec![(spender_addr, 1_000_000)];
-    initial_balances.extend(pox5_staker_initial_balances(
-        num_signers,
-        seed,
-        per_staker_balance,
-    ));
+    let initial_balances = vec![(spender_addr, 1_000_000)];
 
     let signer_test: SignerTest<SpawnedSigner> =
         SignerTest::new_with_config_modifications_and_snapshot(
@@ -157,7 +149,6 @@ fn epoch_4_0_block_commit_uses_single_sbtc_output() {
         token_contract_name,
         registry_contract_name,
         &agg_pubkey,
-        &stakers,
         stake_amount,
         lock_cycles,
     );