Fix multiversioned_signer_protocol_version_calculation test

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

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

@@ -18091,19 +18091,20 @@ fn multiversioned_signer_protocol_version_calculation() {
     if env::var("BITCOIND_TEST") != Ok("1".into()) {
         return;
     }
+
     let num_signers = 5;
     let sender_sk = Secp256k1PrivateKey::random();
     let sender_addr = tests::to_addr(&sender_sk);
-    let send_amt = 1000;
+    let send_amt = 100;
     let send_fee = 180;
-
-    let btc_miner_1_seed = vec![1, 1, 1, 1];
-    let btc_miner_2_seed = vec![2, 2, 2, 2];
-    let btc_miner_1_pk = Keychain::default(btc_miner_1_seed.clone()).get_pub_key();
-    let btc_miner_2_pk = Keychain::default(btc_miner_2_seed.clone()).get_pub_key();
+    let deploy_fee = 1000000;
+    let call_fee = 1000;
     let signer_test: SignerTest<SpawnedSigner> = SignerTest::new_with_config_modifications(
         num_signers,
-        vec![(sender_addr, send_amt + send_fee)],
+        vec![(
+            sender_addr,
+            (send_amt + send_fee) * 10 + deploy_fee + call_fee,
+        )],
         |signer_config| {
             // We don't want the miner of the "inactive" sortition before the flash block
             //  to get timed out.
@@ -18116,8 +18117,11 @@ fn multiversioned_signer_protocol_version_calculation() {
             };
             signer_config.supported_signer_protocol_version = signer_version;
         },
-        |_| {},
-        Some(vec![btc_miner_1_pk, btc_miner_2_pk]),
+        |node_config| {
+            node_config.miner.block_commit_delay = Duration::from_secs(1);
+            node_config.miner.replay_transactions = true;
+        },
+        None,
         None,
     );
 
@@ -18142,9 +18146,14 @@ fn multiversioned_signer_protocol_version_calculation() {
     )
     .unwrap();
     let peer_info_after = signer_test.get_peer_info();
-    let signer_addresses = signer_test.signer_addresses_versions();
+    // All signers will view the active version as 0
+    let signer_addresses: Vec<_> = signer_test
+        .signer_addresses_versions()
+        .into_iter()
+        .map(|(address, _version)| (address, 0u64))
+        .collect();
 
-    info!("------------------------- Waiting for Signer Updates -------------------------");
+    info!("------------------------- Waiting for Signer Updates with Version 0-------------------------");
     // Make sure all signers are on the same page before proposing a block so its accepted
     wait_for_state_machine_update(
         30,
@@ -18162,8 +18171,7 @@ fn multiversioned_signer_protocol_version_calculation() {
     })
     .unwrap();
 
-    info!("------------------------- Verifying Signer Versions and Responses to Tenure Start Block -------------------------");
-    // Assert that the signers sent only acceptances and that all updates indicate that the active protocol version is 0
+    info!("------------------------- Verifying Signers ONLY Sends Acceptances -------------------------");
     wait_for(30, || {
         let mut nmb_accept = 0;
         let stackerdb_events = test_observer::get_stackerdb_chunks();
@@ -18173,21 +18181,14 @@ fn multiversioned_signer_protocol_version_calculation() {
         {
             let message = SignerMessage::consensus_deserialize(&mut chunk.data.as_slice())
                 .expect("Failed to deserialize SignerMessage");
-            match message {
-                SignerMessage::StateMachineUpdate(update) => {
-                    assert_eq!(update.active_signer_protocol_version, 0);
-                }
-                SignerMessage::BlockResponse(response) => {
-                    assert!(
-                        matches!(response, BlockResponse::Accepted(_)),
-                        "Should have only received acceptances"
-                    );
-                    nmb_accept += 1;
-                }
-                _ => {
-                    continue;
-                }
-            }
+            let SignerMessage::BlockResponse(response) = message else {
+                continue;
+            };
+            assert!(
+                matches!(response, BlockResponse::Accepted(_)),
+                "Should have only received acceptances"
+            );
+            nmb_accept += 1;
         }
         Ok(nmb_accept == num_signers)
     })