CRC: Remove StateMachineUpdateContentBase and cleanup SignerDb

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

Author: jferrant

libsigner/src/tests/signer_state.rs

@@ -25,7 +25,7 @@ use clarity::util::hash::Hash160;
 
 use crate::v0::messages::{
     StateMachineUpdate as StateMachineUpdateMessage, StateMachineUpdateContent,
-    StateMachineUpdateContentBase, StateMachineUpdateMinerState,
+    StateMachineUpdateMinerState,
 };
 use crate::v0::signer_state::{
     GlobalStateEvaluator, ReplayTransactionSet, SignerStateMachine, UpdateTime,
@@ -40,16 +40,14 @@ fn generate_global_state_evaluator(num_addresses: u32) -> GlobalStateEvaluator {
         active_protocol_version,
         local_supported_signer_protocol_version,
         StateMachineUpdateContent::V0 {
-            base: StateMachineUpdateContentBase {
-                burn_block: ConsensusHash([0x55; 20]),
-                burn_block_height: 100,
-                current_miner: StateMachineUpdateMinerState::ActiveMiner {
-                    current_miner_pkh: Hash160([0xab; 20]),
-                    tenure_id: ConsensusHash([0x44; 20]),
-                    parent_tenure_id: ConsensusHash([0x22; 20]),
-                    parent_tenure_last_block: StacksBlockId([0x33; 32]),
-                    parent_tenure_last_block_height: 1,
-                },
+            burn_block: ConsensusHash([0x55; 20]),
+            burn_block_height: 100,
+            current_miner: StateMachineUpdateMinerState::ActiveMiner {
+                current_miner_pkh: Hash160([0xab; 20]),
+                tenure_id: ConsensusHash([0x44; 20]),
+                parent_tenure_id: ConsensusHash([0x22; 20]),
+                parent_tenure_last_block: StacksBlockId([0x33; 32]),
+                parent_tenure_last_block_height: 1,
             },
         },
     )
@@ -95,12 +93,9 @@ fn determine_latest_supported_signer_protocol_versions() {
         local_supported_signer_protocol_version,
         content:
             StateMachineUpdateContent::V0 {
-                base:
-                    StateMachineUpdateContentBase {
-                        burn_block,
-                        burn_block_height,
-                        current_miner,
-                    },
+                burn_block,
+                burn_block_height,
+                current_miner,
             },
         ..
     } = local_update.clone()
@@ -115,11 +110,9 @@ fn determine_latest_supported_signer_protocol_versions() {
             active_signer_protocol_version,
             new_version,
             StateMachineUpdateContent::V0 {
-                base: StateMachineUpdateContentBase {
-                    burn_block,
-                    burn_block_height,
-                    current_miner: current_miner.clone(),
-                },
+                burn_block,
+                burn_block_height,
+                current_miner: current_miner.clone(),
             },
         )
         .unwrap();
@@ -139,11 +132,9 @@ fn determine_latest_supported_signer_protocol_versions() {
         active_signer_protocol_version,
         3,
         StateMachineUpdateContent::V0 {
-            base: StateMachineUpdateContentBase {
-                burn_block,
-                burn_block_height,
-                current_miner,
-            },
+            burn_block,
+            burn_block_height,
+            current_miner,
         },
     )
     .unwrap();
@@ -174,12 +165,9 @@ fn determine_global_burn_views() {
         local_supported_signer_protocol_version,
         content:
             StateMachineUpdateContent::V0 {
-                base:
-                    StateMachineUpdateContentBase {
-                        burn_block,
-                        burn_block_height,
-                        current_miner,
-                    },
+                burn_block,
+                burn_block_height,
+                current_miner,
             },
         ..
     } = local_update.clone()
@@ -197,11 +185,9 @@ fn determine_global_burn_views() {
         active_signer_protocol_version,
         local_supported_signer_protocol_version,
         StateMachineUpdateContent::V0 {
-            base: StateMachineUpdateContentBase {
-                burn_block,
-                burn_block_height: burn_block_height.wrapping_add(1),
-                current_miner: current_miner.clone(),
-            },
+            burn_block,
+            burn_block_height: burn_block_height.wrapping_add(1),
+            current_miner: current_miner.clone(),
         },
     )
     .unwrap();
@@ -238,12 +224,9 @@ fn determine_global_states() {
         local_supported_signer_protocol_version,
         content:
             StateMachineUpdateContent::V0 {
-                base:
-                    StateMachineUpdateContentBase {
-                        burn_block,
-                        burn_block_height,
-                        current_miner,
-                    },
+                burn_block,
+                burn_block_height,
+                current_miner,
             },
         ..
     } = local_update.clone()
@@ -274,11 +257,9 @@ fn determine_global_states() {
         active_signer_protocol_version,
         local_supported_signer_protocol_version,
         StateMachineUpdateContent::V0 {
-            base: StateMachineUpdateContentBase {
-                burn_block,
-                burn_block_height,
-                current_miner: new_miner.clone(),
-            },
+            burn_block,
+            burn_block_height,
+            current_miner: new_miner.clone(),
         },
     )
     .unwrap();
@@ -321,12 +302,9 @@ fn determine_global_states_with_tx_replay_set() {
     let StateMachineUpdateMessage {
         content:
             StateMachineUpdateContent::V0 {
-                base:
-                    StateMachineUpdateContentBase {
-                        burn_block,
-                        burn_block_height,
-                        current_miner,
-                    },
+                burn_block,
+                burn_block_height,
+                current_miner,
             },
         ..
     } = local_update.clone()
@@ -354,11 +332,9 @@ fn determine_global_states_with_tx_replay_set() {
         active_signer_protocol_version,
         local_supported_signer_protocol_version,
         StateMachineUpdateContent::V1 {
-            base: StateMachineUpdateContentBase {
-                burn_block: ConsensusHash([20u8; 20]),
-                burn_block_height,
-                current_miner: current_miner.clone(),
-            },
+            burn_block: ConsensusHash([20u8; 20]),
+            burn_block_height,
+            current_miner: current_miner.clone(),
             replay_transactions: vec![],
         },
     )
@@ -412,11 +388,9 @@ fn determine_global_states_with_tx_replay_set() {
         active_signer_protocol_version,
         local_supported_signer_protocol_version,
         StateMachineUpdateContent::V1 {
-            base: StateMachineUpdateContentBase {
-                burn_block,
-                burn_block_height,
-                current_miner: current_miner.clone(),
-            },
+            burn_block,
+            burn_block_height,
+            current_miner: current_miner.clone(),
             replay_transactions: vec![tx.clone()],
         },
     )