change the verifier name for sync and mining

starcoinorg · Oct 16, 2024 · 16b20f8 · 16b20f8
1 parent 8ad0ed6
commit 16b20f8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/chain/src/chain.rs b/chain/src/chain.rs
@@ -1,7 +1,7 @@
 // Copyright (c) The Starcoin Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::verifier::{BlockVerifier, DagVerifier, DagVerifierWithGhostData, FullVerifier};
+use crate::verifier::{BlockVerifier, DagVerifierForMining, DagVerifierForSync, FullVerifier};
 use anyhow::{bail, ensure, format_err, Ok, Result};
 use sp_utils::stop_watch::{watch, CHAIN_WATCH_NAME};
 use starcoin_accumulator::inmemory::InMemoryAccumulator;
@@ -1246,7 +1246,7 @@ impl ChainReader for BlockChain {
     }
 
     fn verify(&self, block: Block) -> Result<VerifiedBlock> {
-        DagVerifier::verify_block(self, block)
+        DagVerifierForMining::verify_block(self, block)
     }
 
     fn execute(&mut self, verified_block: VerifiedBlock) -> Result<ExecutedBlock> {
@@ -1725,14 +1725,14 @@ impl ChainWriter for BlockChain {
     }
 
     fn apply(&mut self, block: Block) -> Result<ExecutedBlock> {
-        self.apply_with_verifier::<DagVerifier>(block)
+        self.apply_with_verifier::<DagVerifierForMining>(block)
     }
 
     fn chain_state(&mut self) -> &ChainStateDB {
         &self.statedb
     }
     fn apply_for_sync(&mut self, block: Block) -> Result<ExecutedBlock> {
-        self.apply_with_verifier::<DagVerifierWithGhostData>(block)
+        self.apply_with_verifier::<DagVerifierForSync>(block)
     }
 }
 

diff --git a/chain/src/verifier/mod.rs b/chain/src/verifier/mod.rs
@@ -427,8 +427,8 @@ impl BasicDagVerifier {
 }
 
 // for mining
-pub struct DagVerifier;
-impl BlockVerifier for DagVerifier {
+pub struct DagVerifierForMining;
+impl BlockVerifier for DagVerifierForMining {
     fn verify_header<R>(current_chain: &R, new_block_header: &BlockHeader) -> Result<()>
     where
         R: ChainReader,
@@ -451,8 +451,8 @@ impl BlockVerifier for DagVerifier {
 }
 
 // for sync
-pub struct DagVerifierWithGhostData;
-impl BlockVerifier for DagVerifierWithGhostData {
+pub struct DagVerifierForSync;
+impl BlockVerifier for DagVerifierForSync {
     fn verify_header<R>(current_chain: &R, new_block_header: &BlockHeader) -> Result<()>
     where
         R: ChainReader,

diff --git a/sync/src/block_connector/write_block_chain.rs b/sync/src/block_connector/write_block_chain.rs
@@ -248,7 +248,7 @@ where
     #[cfg(test)]
     pub fn apply_failed(&mut self, block: Block) -> Result<()> {
         use anyhow::bail;
-        use starcoin_chain::verifier::{DagVerifier, FullVerifier};
+        use starcoin_chain::verifier::{DagVerifierForMining, FullVerifier};
 
         let verified_block = match self.main.check_chain_type()? {
             ChainType::Single => {
@@ -257,7 +257,8 @@ where
             }
             ChainType::Dag => {
                 // apply but no connection
-                self.main.verify_with_verifier::<DagVerifier>(block)?
+                self.main
+                    .verify_with_verifier::<DagVerifierForMining>(block)?
             }
         };
         let _executed_block = self.main.execute(verified_block)?;

diff --git a/sync/src/parallel/executor.rs b/sync/src/parallel/executor.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use starcoin_chain::{verifier::DagVerifierWithGhostData, BlockChain, ChainReader};
+use starcoin_chain::{verifier::DagVerifierForSync, BlockChain, ChainReader};
 use starcoin_chain_api::ExecutedBlock;
 use starcoin_config::TimeService;
 use starcoin_crypto::HashValue;
@@ -168,7 +168,7 @@ impl DagBlockExecutor {
                         match chain
                             .as_mut()
                             .expect("it cannot be none!")
-                            .apply_with_verifier::<DagVerifierWithGhostData>(block)
+                            .apply_with_verifier::<DagVerifierForSync>(block)
                         {
                             Ok(executed_block) => {
                                 info!(