Revert "feat: introduce trait for block validation fn execution"

This reverts commit 3b31683.

Signed-off-by: jeluard <[email protected]>

Author: jeluard

crates/amaru-ledger/src/rules.rs

@@ -130,7 +130,7 @@ pub(crate) mod tests {
         context::assert::{AssertPreparationContext, AssertValidationContext},
         rules::{
             self,
-            block::{BlockValidation, DefaultRuleValidationExecutor, InvalidBlockDetails},
+            block::{BlockValidation, InvalidBlockDetails},
         },
         tests::{fake_input, fake_output},
     };
@@ -176,7 +176,6 @@ pub(crate) mod tests {
         prepare_block(&mut ctx, &block);
 
         let results = rules::block::execute(
-            &mut DefaultRuleValidationExecutor::new(),
             &mut AssertValidationContext::from(ctx),
             ProtocolParameters::default(),
             &block,
@@ -203,12 +202,7 @@ pub(crate) mod tests {
 
         prepare_block(&mut ctx, &block);
 
-        let results = rules::block::execute(
-            &mut DefaultRuleValidationExecutor::new(),
-            &mut AssertValidationContext::from(ctx),
-            pp,
-            &block,
-        );
+        let results = rules::block::execute(&mut AssertValidationContext::from(ctx), pp, &block);
 
         assert!(matches!(
             results,

crates/amaru-ledger/src/rules/block.rs

@@ -87,71 +87,24 @@ impl From<BlockValidation> for Result<(), InvalidBlockDetails> {
     }
 }
 
-pub struct DefaultRuleValidationExecutor {}
-
-impl DefaultRuleValidationExecutor {
-    pub fn new() -> Self {
-        DefaultRuleValidationExecutor {}
-    }
-}
-
-impl Default for DefaultRuleValidationExecutor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// A default implementation of the RuleValidationExecutor trait that executes all block validation fns one by one.
-/// If a block validation fn fails, the error is returned immediately.
-impl<C: ValidationContext<FinalState = S>, S: From<C>> RuleValidationExecutor<C, S>
-    for DefaultRuleValidationExecutor
-{
-    fn execute(
-        &mut self,
-        context: &mut C,
-        protocol_params: &ProtocolParameters,
-        block: &MintedBlock<'_>,
-        block_validation_fns: &[fn(
-            &mut C,
-            &MintedBlock<'_>,
-            &ProtocolParameters,
-        ) -> BlockValidation],
-    ) -> BlockValidation {
-        for block_validation_fn in block_validation_fns {
-            block_validation_fn(context, block, protocol_params)?;
-        }
-        BlockValidation::Valid
-    }
-}
-
-pub trait RuleValidationExecutor<C: ValidationContext<FinalState = S>, S: From<C>> {
-    fn execute(
-        &mut self,
-        context: &mut C,
-        protocol_params: &ProtocolParameters,
-        block: &MintedBlock<'_>,
-        block_validation_fns: &[fn(
-            &mut C,
-            &MintedBlock<'_>,
-            &ProtocolParameters,
-        ) -> BlockValidation],
-    ) -> BlockValidation;
-}
-
 #[instrument(level = Level::TRACE, skip_all)]
 pub fn execute<C: ValidationContext<FinalState = S>, S: From<C>>(
-    rule_validation_executor: &mut dyn RuleValidationExecutor<C, S>,
     context: &mut C,
     protocol_params: ProtocolParameters,
     block: &MintedBlock<'_>,
 ) -> BlockValidation {
+    // Block level validations functions share the same signature.
+    // Currently apply them one by one
+    // TODO consider an abstract strategy pattern to apply them (e.g. in parallel, in a priority order, ...)
     let block_validation_fns = vec![
         header_size::block_header_size_valid,
         body_size::block_body_size_valid,
         ex_units::block_ex_units_valid,
     ];
 
-    rule_validation_executor.execute(context, &protocol_params, block, &block_validation_fns)?;
+    for block_validation_fn in block_validation_fns {
+        block_validation_fn(context, block, &protocol_params)?;
+    }
 
     let failed_transactions = FailedTransactions::from_block(block);
 

crates/amaru/src/stages/ledger.rs

@@ -3,11 +3,7 @@ use amaru_kernel::{
 };
 use amaru_ledger::{
     context::{self, DefaultValidationContext},
-    rules::{
-        self,
-        block::{BlockValidation, DefaultRuleValidationExecutor},
-        parse_block,
-    },
+    rules::{self, block::BlockValidation, parse_block},
     state::{self, BackwardError, VolatileState},
     store::Store,
     BlockValidationResult, RawBlock, ValidateBlockEvent,
@@ -105,12 +101,9 @@ impl<S: Store + Send> Stage<S> {
 
         let mut context = self.create_validation_context(&block)?;
 
-        if let BlockValidation::Invalid(err) = rules::validate_block(
-            &mut DefaultRuleValidationExecutor::new(),
-            &mut context,
-            ProtocolParameters::default(),
-            &block,
-        ) {
+        if let BlockValidation::Invalid(err) =
+            rules::validate_block(&mut context, ProtocolParameters::default(), &block)
+        {
             return Ok(BlockValidation::Invalid(err));
         };