add some fix

starcoinorg · Sep 2, 2024 · 95215f1 · 95215f1
1 parent 2e4e560
commit 95215f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/sync/src/parallel/executor.rs b/sync/src/parallel/executor.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use starcoin_chain::{verifier::DagVerifier, BlockChain, ChainReader};
+use starcoin_chain_api::ExecutedBlock;
 use starcoin_config::TimeService;
 use starcoin_crypto::HashValue;
 use starcoin_dag::blockdag::BlockDAG;
@@ -16,7 +17,7 @@ use tokio::{
 pub enum ExecuteState {
     Ready(HashValue),
     Executing(HashValue),
-    Executed(BlockHeader),
+    Executed(ExecutedBlock),
     Error(BlockHeader),
     Closed,
 }
@@ -129,15 +130,14 @@ impl DagBlockExecutor {
                        info!("sync parallel worker {:p} will execute block: {:?}", &self, block.header().id());
                         match chain.as_mut().expect("it cannot be none!").apply_with_verifier::<DagVerifier>(block) {
                             Ok(executed_block) => {
-                                let header = executed_block.header();
                                 info!(
                                     "succeed to execute block: number: {:?}, id: {:?}",
-                                    header.number(),
-                                    header.id()
+                                    executed_block.header().number(),
+                                    executed_block.header().id()
                                 );
                                 match self
                                     .sender
-                                    .send(ExecuteState::Executed(header.clone()))
+                                    .send(ExecuteState::Executed(executed_block))
                                     .await
                                 {
                                     Ok(_) => (),

diff --git a/sync/src/parallel/sender.rs b/sync/src/parallel/sender.rs
@@ -54,13 +54,6 @@ impl DagBlockSender {
     async fn dispatch_to_worker(&mut self, block: &Block) -> anyhow::Result<bool> {
         for executor in &mut self.executors {
             match &executor.state {
-                // ExecuteState::Executed(executing_header_block) => {
-                //     if executing_header_block.id() == block.header().parent_hash() {
-                //         executor.state = ExecuteState::Executing(block.id());
-                //         executor.sender_to_executor.send(block.clone()).await?;
-                //         return anyhow::Ok(true);
-                //     }
-                // }
                 ExecuteState::Executing(header_id) => {
                     if *header_id == block.header().parent_hash() || block.header.parents_hash().contains(header_id) {
                         executor.state = ExecuteState::Executing(block.id());
@@ -129,8 +122,6 @@ impl DagBlockSender {
             self.flush_executor_state().await?;
         }
 
-        self.sync_dag_store.delete_all_dag_sync_block()?;
-
         self.wait_for_finish().await?;
 
         Ok(())
@@ -141,8 +132,9 @@ impl DagBlockSender {
             match worker.receiver_from_executor.try_recv() {
                 Ok(state) => {
                     match state {
-                        ExecuteState::Executed(header_id) => {
-                            worker.state = ExecuteState::Executed(header_id);
+                        ExecuteState::Executed(executed_block) => {
+                            self.sync_dag_store.delete_dag_sync_block(executed_block.block().header().number(), executed_block.header().id())?;
+                            worker.state = ExecuteState::Executed(executed_block);
                         }
                         _ => ()
                     }