use FlexiDagConfig when reading dag fork height if G_TEST_DAG_FORK_ST…

…ATE_KEY is not set
starcoinorg · May 31, 2024 · 0ed3a57 · 0ed3a57
1 parent 79e7a06
commit 0ed3a57
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/chain/src/chain.rs b/chain/src/chain.rs
@@ -2360,15 +2360,10 @@ impl BlockChain {
             if result.is_ok() {
                 Ok(Some(G_TEST_DAG_FORK_HEIGHT))
             } else {
-                let result = self.dag.get_dag_state(self.current_header().id());
-                if result.is_ok() {
-                    Ok(Some(G_TEST_DAG_FORK_HEIGHT))
-                } else {
-                    Ok(self
-                        .statedb
-                        .get_on_chain_config::<FlexiDagConfig>()?
-                        .map(|c| c.effective_height))
-                }
+                Ok(self
+                    .statedb
+                    .get_on_chain_config::<FlexiDagConfig>()?
+                    .map(|c| c.effective_height))
             }
         } else {
             Ok(self