refactor validator.rs -> tx_validator.rs

narwhal/worker/src/lib.rs

@@ -13,8 +13,8 @@ mod handlers;
 pub mod metrics;
 mod primary_connector;
 mod quorum_waiter;
-mod validator;
+mod tx_validator;
 mod worker;
 
-pub use crate::validator::{TrivialTxValidator, TxValidator};
+pub use crate::tx_validator::{TrivialTxValidator, TxValidator};
 pub use crate::worker::Worker;

narwhal/worker/src/validator.rs → narwhal/worker/src/tx_validator.rs

@@ -1,3 +1,5 @@
+use std::fmt::{Debug, Display};
+
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 use types::Batch;
@@ -6,21 +8,24 @@ use types::Batch;
 /// of a batch of transactions (from another validator). Invalid transactions will not receive
 /// further processing.
 pub trait TxValidator: Clone + Send + Sync + 'static {
-    type Error: Send + Sync + 'static;
-
+    type Error: Display + Debug + Send + Sync + 'static;
     /// Determines if a transaction valid for the worker to consider putting in a batch
-    fn validate(&self, _t: &[u8]) -> Result<(), Self::Error> {
-        Ok(())
-    }
+    fn validate(&self, t: &[u8]) -> Result<(), Self::Error>;
     /// Determines if this batch can be voted on
-    fn validate_batch(&self, _b: &Batch) -> Result<(), Self::Error> {
-        Ok(())
-    }
+    fn validate_batch(&self, b: &Batch) -> Result<(), Self::Error>;
 }
 
 /// Simple validator that accepts all transactions and batches.
 #[derive(Debug, Clone, Default)]
 pub struct TrivialTxValidator;
 impl TxValidator for TrivialTxValidator {
     type Error = eyre::Report;
+
+    fn validate(&self, _t: &[u8]) -> Result<(), Self::Error> {
+        Ok(())
+    }
+
+    fn validate_batch(&self, _b: &Batch) -> Result<(), Self::Error> {
+        Ok(())
+    }
 }