Refactor/Simplify validation logic

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- [#1847](https://github.com/FuelLabs/fuel-core/pull/1847): Simplify the validation interface to use `Block`. Remove `Validation` variant of `ExecutionKind`.
 - [#1832](https://github.com/FuelLabs/fuel-core/pull/1832): Snapshot generation can be cancelled. Progress is also reported.
 - [#1837](https://github.com/FuelLabs/fuel-core/pull/1837): Refactor the executor and separate validation from the other use cases
 
@@ -22,10 +23,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [#1844](https://github.com/FuelLabs/fuel-core/pull/1844): Fixed the publishing of the `fuel-core 0.25.1` release.
 - [1842](https://github.com/FuelLabs/fuel-core/pull/1842): Ignore RUSTSEC-2024-0336: `rustls::ConnectionCommon::complete_io` could fall into an infinite loop based on network
 
-### Changed
-
-- [#1837](https://github.com/FuelLabs/fuel-core/pull/1837): Refactor the executor and separate validation from the other use cases
-
 ## [Version 0.25.1]
 
 ### Fixed
@@ -49,7 +46,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- [#1837](https://github.com/FuelLabs/fuel-core/pull/1837): Refactor the executor and separate validation from the other use cases
 - [#1833](https://github.com/FuelLabs/fuel-core/pull/1833): Regenesis of `SpentMessages` and `ProcessedTransactions`.
 - [#1830](https://github.com/FuelLabs/fuel-core/pull/1830): Use versioning enum for WASM executor input and output.
 - [#1816](https://github.com/FuelLabs/fuel-core/pull/1816): Updated the upgradable executor to fetch the state transition bytecode from the database when the version doesn't match a native one. This change enables the WASM executor in the "production" build and requires a `wasm32-unknown-unknown` target.

crates/fuel-core/src/executor.rs

@@ -859,7 +859,7 @@ mod tests {
             let tx = Transaction::default_test_tx();
 
             let mut block = Block::default();
-            *block.transactions_mut() = vec![mint.into(), tx];
+            *block.transactions_mut() = vec![mint.clone().into(), tx, mint.into()];
             block.header_mut().recalculate_metadata();
 
             let mut validator = create_executor(Default::default(), Default::default());
@@ -1176,8 +1176,8 @@ mod tests {
             .transaction()
             .clone()
             .into();
-
-        let tx_id = tx.id(&ChainId::default());
+        let chain_id = ConsensusParameters::default().chain_id();
+        let transaction_id = tx.id(&chain_id);
 
         let mut producer = create_executor(Default::default(), Default::default());
 
@@ -1197,11 +1197,12 @@ mod tests {
             }
         }
 
-        let verify_result = verifier.validate_and_commit(block);
-        assert!(matches!(
-            verify_result,
-            Err(ExecutorError::InvalidTransactionOutcome { transaction_id }) if transaction_id == tx_id
-        ));
+        // then
+        let err = verifier.validate_and_commit(block).unwrap_err();
+        assert_eq!(
+            err,
+            ExecutorError::InvalidTransactionOutcome { transaction_id }
+        );
     }
 
     // corrupt the merkle sum tree commitment from a produced block and verify that the
@@ -1233,9 +1234,9 @@ mod tests {
         block.header_mut().set_transaction_root(rng.gen());
         block.header_mut().recalculate_metadata();
 
-        let verify_result = verifier.validate_and_commit(block);
+        let err = verifier.validate_and_commit(block).unwrap_err();
 
-        assert!(matches!(verify_result, Err(ExecutorError::InvalidBlockId)))
+        assert_eq!(err, ExecutorError::BlockMismatch)
     }
 
     // invalidate a block if a tx is missing at least one coin input
@@ -2177,14 +2178,14 @@ mod tests {
         }
 
         let verifier = create_executor(db, Default::default());
-        let verify_result = verifier.validate_without_commit(second_block);
+        let err = verifier.validate_without_commit(second_block).unwrap_err();
 
-        assert!(matches!(
-            verify_result,
-            Err(ExecutorError::InvalidTransactionOutcome {
-                transaction_id
-            }) if transaction_id == tx_id
-        ));
+        assert_eq!(
+            err,
+            ExecutorError::InvalidTransactionOutcome {
+                transaction_id: tx_id
+            }
+        );
     }
 
     #[test]