refactor transactions

Author: pkhry

crates/forge/src/runner.rs

@@ -514,6 +514,8 @@ impl<'a> FunctionRunner<'a> {
         call_after_invariant: bool,
         identified_contracts: Option<&ContractsByAddress>,
     ) -> TestResult {
+        self.executor.strategy.runner.rollback_transaction(self.executor.strategy.context.as_ref());
+        self.executor.strategy.runner.start_transaction(self.executor.strategy.context.as_ref());
         if let Err(e) = self.apply_function_inline_config(func) {
             self.result.single_fail(Some(e.to_string()));
             return self.result;
@@ -544,15 +546,8 @@ impl<'a> FunctionRunner<'a> {
     /// State modifications of before test txes and unit test function call are discarded after
     /// test ends, similar to `eth_call`.
     fn run_unit_test(mut self, func: &Function) -> TestResult {
-        let binding = self.executor.into_owned();
-        self.executor = Cow::Owned(binding);
-        self.executor.strategy.runner.start_transaction(self.executor.strategy.context.as_ref());
         // Prepare unit test execution.
         if self.prepare_test(func).is_err() {
-            self.executor
-                .strategy
-                .runner
-                .rollback_transaction(self.executor.strategy.context.as_ref());
             return self.result;
         }
 
@@ -569,22 +564,14 @@ impl<'a> FunctionRunner<'a> {
             Err(EvmError::Execution(err)) => (err.raw, Some(err.reason)),
             Err(EvmError::Skip(reason)) => {
                 self.result.single_skip(reason);
-                self.executor
-                    .strategy
-                    .runner
-                    .rollback_transaction(self.executor.strategy.context.as_ref());
                 return self.result;
             }
             Err(err) => {
                 self.result.single_fail(Some(err.to_string()));
-                self.executor
-                    .strategy
-                    .runner
-                    .rollback_transaction(self.executor.strategy.context.as_ref());
+
                 return self.result;
             }
         };
-        self.executor.strategy.runner.rollback_transaction(self.executor.strategy.context.as_ref());
 
         let success =
             self.executor.is_raw_call_mut_success(self.address, &mut raw_call_result, false);
@@ -602,8 +589,6 @@ impl<'a> FunctionRunner<'a> {
     /// - `bool[] public fixtureSwap = [true, false]` The `table_test` is then called with the pair
     ///   of args `(2, true)` and `(5, false)`.
     fn run_table_test(mut self, func: &Function) -> TestResult {
-        let binding = self.executor.into_owned();
-        self.executor = Cow::Owned(binding); // Prepare unit test execution.
         if self.prepare_test(func).is_err() {
             return self.result;
         }
@@ -733,8 +718,6 @@ impl<'a> FunctionRunner<'a> {
         identified_contracts: &ContractsByAddress,
         test_bytecode: &Bytes,
     ) -> TestResult {
-        let binding = self.executor.into_owned();
-        self.executor = Cow::Owned(binding);
         // First, run the test normally to see if it needs to be skipped.
         if let Err(EvmError::Skip(reason)) = self.executor.call(
             self.sender,
@@ -959,8 +942,6 @@ impl<'a> FunctionRunner<'a> {
     /// State modifications of before test txes and fuzz test are discarded after test ends,
     /// similar to `eth_call`.
     fn run_fuzz_test(mut self, func: &Function) -> TestResult {
-        let binding = self.executor.into_owned();
-        self.executor = Cow::Owned(binding);
         // Prepare fuzz test execution.
         if self.prepare_test(func).is_err() {
             return self.result;