remove setup contracts from snapshot

Author: Jiloc

stackslib/src/chainstate/tests/consensus.rs

@@ -1048,7 +1048,12 @@ impl ContractConsensusTest<'_> {
             call_epochs.iter().all(|e| e >= min_deploy_epoch),
             "All call epochs must be >= the minimum deploy epoch"
         );
-
+        assert!(
+            setup_contracts
+                .iter()
+                .all(|c| c.deploy_epoch.is_none() || c.deploy_epoch.unwrap() >= *min_deploy_epoch),
+            "All setup contracts must have a deploy epoch >= the minimum deploy epoch"
+        );
         // Build epoch_blocks map based on deploy and call epochs
         let mut num_blocks_per_epoch: HashMap<StacksEpochId, u64> = HashMap::new();
         let mut contract_deploys_per_epoch: HashMap<StacksEpochId, Vec<(String, ClarityVersion)>> =
@@ -1173,27 +1178,30 @@ impl ContractConsensusTest<'_> {
     }
 
     /// Deploys prerequisite contracts scheduled for the given epoch.
-    fn deploy_setup_contracts(&mut self, epoch: StacksEpochId) -> Vec<ExpectedResult> {
+    /// Panics if the deployment fails.
+    fn deploy_setup_contracts(&mut self, epoch: StacksEpochId) {
         let Some(contracts) = self.setup_contracts_per_epoch.get(&epoch).cloned() else {
-            return vec![];
+            return;
         };
 
         let is_naka_block = epoch.uses_nakamoto_blocks();
-        contracts
-            .into_iter()
-            .map(|contract| {
-                self.chain.consume_pre_naka_prepare_phase();
-                self.append_tx_block(
-                    &TestTxSpec::ContractDeploy {
-                        sender: &FAUCET_PRIV_KEY,
-                        name: &contract.name,
-                        code: &contract.code,
-                        clarity_version: contract.clarity_version,
-                    },
-                    is_naka_block,
-                )
-            })
-            .collect()
+        contracts.into_iter().for_each(|contract| {
+            self.chain.consume_pre_naka_prepare_phase();
+            let result = self.append_tx_block(
+                &TestTxSpec::ContractDeploy {
+                    sender: &FAUCET_PRIV_KEY,
+                    name: &contract.name,
+                    code: &contract.code,
+                    clarity_version: contract.clarity_version,
+                },
+                is_naka_block,
+            );
+            assert!(
+                matches!(result, ExpectedResult::Success(_)),
+                "Expected success for setup contract {}: {result:?}",
+                contract.name,
+            );
+        });
     }
 
     /// Deploys all contract versions scheduled for the given epoch.
@@ -1313,7 +1321,9 @@ impl ContractConsensusTest<'_> {
                 .test_chainstate
                 .advance_into_epoch(&private_key, epoch);
 
-            results.extend(self.deploy_setup_contracts(epoch));
+            // Differently from the deploy_contracts and call_contracts functions, setup contracts are expected to succeed.
+            // Their receipt is not relevant to the test.
+            self.deploy_setup_contracts(epoch);
             results.extend(self.deploy_contracts(epoch));
             results.extend(self.call_contracts(epoch));
         }

stackslib/src/chainstate/tests/snapshots/blockstack_lib__chainstate__tests__static_analysis_tests__static_check_error_bad_trait_implementation.snap

@@ -3,34 +3,6 @@ source: stackslib/src/chainstate/tests/static_analysis_tests.rs
 expression: result
 ---
 [
-  Success(ExpectedBlockOutput(
-    marf_hash: "ea4bd6655c60fab8f7361d5dadafe85828880fe8eedfcd1ee1009089d080c69a",
-    evaluated_epoch: Epoch33,
-    transactions: [
-      ExpectedTransactionOutput(
-        tx: "SmartContract(name: trait-contract, code_body: [..], clarity_version: Some(Clarity4))",
-        vm_error: "None [NON-CONSENSUS BREAKING]",
-        return_type: Response(ResponseData(
-          committed: true,
-          data: Bool(true),
-        )),
-        cost: ExecutionCost(
-          write_length: 87,
-          write_count: 2,
-          read_length: 1,
-          read_count: 1,
-          runtime: 10190,
-        ),
-      ),
-    ],
-    total_block_cost: ExecutionCost(
-      write_length: 87,
-      write_count: 2,
-      read_length: 1,
-      read_count: 1,
-      runtime: 10190,
-    ),
-  )),
   Success(ExpectedBlockOutput(
     marf_hash: "3e216b0c84ceed92b873d280c01a1541de4bc3fc8dea66968cd7af59387080e5",
     evaluated_epoch: Epoch33,