fix: cargo check errors after merge

Author: hstove

stacks-signer/src/tests/chainstate.rs

@@ -209,6 +209,7 @@ fn reorg_timing_testing(
             consensus_hash: last_sortition.consensus_hash,
             was_sortition: true,
             first_block_mined: Some(StacksBlockId([1; 32])),
+            nakamoto_blocks: None,
         },
         TenureForkingInfo {
             burn_block_hash: BurnchainHeaderHash([128; 32]),
@@ -218,6 +219,7 @@ fn reorg_timing_testing(
             consensus_hash: view.cur_sortition.parent_tenure_id,
             was_sortition: true,
             first_block_mined: Some(StacksBlockId([2; 32])),
+            nakamoto_blocks: None,
         },
     ];
 

stacks-signer/src/tests/signer_state.rs

@@ -219,6 +219,7 @@ fn determine_global_states() {
         burn_block_height,
         current_miner: (&current_miner).into(),
         active_signer_protocol_version: local_supported_signer_protocol_version, // a majority of signers are saying they support version the same local_supported_signer_protocol_version, so update it here...
+        tx_replay_state: false,
     };
 
     assert_eq!(
@@ -263,6 +264,7 @@ fn determine_global_states() {
         burn_block_height,
         current_miner: (&new_miner).into(),
         active_signer_protocol_version: local_supported_signer_protocol_version, // a majority of signers are saying they support version the same local_supported_signer_protocol_version, so update it here...
+        tx_replay_state: false,
     };
 
     // Let's tip the scales over to a different miner

stacks-signer/src/v0/signer_state.rs

@@ -150,6 +150,7 @@ impl GlobalStateEvaluator {
                 burn_block_height: *burn_block_height,
                 current_miner: current_miner.into(),
                 active_signer_protocol_version,
+                tx_replay_state: false,
             };
             let entry = state_views
                 .entry(state_machine.clone())
@@ -845,6 +846,7 @@ impl LocalStateMachine {
                 burn_block_height: *burn_block_height,
                 current_miner: current_miner.into(),
                 active_signer_protocol_version,
+                tx_replay_state: false,
             });
             // Because we updated our active signer protocol version, update local_update so its included in the subsequent evaluations
             let update: Result<StateMachineUpdateMessage, _> = (&*self).try_into();
@@ -877,6 +879,7 @@ impl LocalStateMachine {
                 burn_block_height,
                 current_miner: (&new_miner).into(),
                 active_signer_protocol_version,
+                tx_replay_state: false,
             });
         }
     }

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -12271,7 +12271,7 @@ fn handle_considered_txs_foreign_key_failure() {
     next_block_and_process_new_stacks_block(&mut btc_regtest_controller, 60, &coord_channel)
         .unwrap();
 
-    let good_transfer_tx = make_stacks_transfer(
+    let good_transfer_tx = make_stacks_transfer_serialized(
         &good_sender_sk,
         0,
         send_fee,
@@ -12293,7 +12293,7 @@ fn handle_considered_txs_foreign_key_failure() {
     TEST_MINE_STALL.set(true);
     TEST_TX_STALL.set(true);
 
-    let bad_transfer_tx = make_stacks_transfer(
+    let bad_transfer_tx = make_stacks_transfer_serialized(
         &bad_sender_sk,
         0,
         send_fee,
@@ -12421,7 +12421,7 @@ fn empty_mempool_sleep_ms() {
     info!("------------------------- Submit a transaction -------------------------");
     let proposals_before = naka_proposed_blocks.load(Ordering::SeqCst);
 
-    let transfer_tx = make_stacks_transfer(
+    let transfer_tx = make_stacks_transfer_serialized(
         &sender_sk,
         0,
         send_fee,