header_map: reduce total_difficulty usage from HeaderIndexMap

Signed-off-by: Eval EXEC <[email protected]>

Author: eval-exec

shared/src/types/mod.rs

@@ -1,7 +1,9 @@
 #![allow(missing_docs)]
-use ckb_types::core::{BlockNumber, EpochNumberWithFraction};
-use ckb_types::packed::Byte32;
-use ckb_types::{BlockNumberAndHash, U256};
+use ckb_types::{
+    BlockNumberAndHash, U256,
+    core::{self, BlockNumber, EpochNumberWithFraction},
+    packed::Byte32,
+};
 
 pub mod header_map;
 
@@ -66,8 +68,8 @@ impl HeaderIndexView {
 
     pub fn build_skip<F, G>(&mut self, tip_number: BlockNumber, get_header_view: F, fast_scanner: G)
     where
-        F: Fn(&Byte32, bool) -> Option<HeaderIndexView>,
-        G: Fn(BlockNumber, BlockNumberAndHash) -> Option<HeaderIndexView>,
+        F: Fn(&Byte32, bool) -> Option<HeaderView>,
+        G: Fn(BlockNumber, BlockNumberAndHash) -> Option<HeaderView>,
     {
         if self.number == 0 {
             return;
@@ -88,10 +90,10 @@ impl HeaderIndexView {
         number: BlockNumber,
         get_header_view: F,
         fast_scanner: G,
-    ) -> Option<HeaderIndexView>
+    ) -> Option<core::HeaderView>
     where
-        F: Fn(&Byte32, bool) -> Option<HeaderIndexView>,
-        G: Fn(BlockNumber, BlockNumberAndHash) -> Option<HeaderIndexView>,
+        F: Fn(&Byte32, bool) -> Option<HeaderView>,
+        G: Fn(BlockNumber, BlockNumberAndHash) -> Option<HeaderView>,
     {
         if number > self.number() {
             return None;

sync/src/relayer/compact_block_process.rs

@@ -261,7 +261,7 @@ fn contextual_check(
     }
 
     let store_first = tip.number() + 1 >= compact_block_header.number();
-    let parent = shared.get_header_index_view(
+    let parent = shared.get_header_view(
         &compact_block_header.data().raw().parent_hash(),
         store_first,
     );
@@ -307,7 +307,7 @@ fn contextual_check(
                 })
                 .or_else(|| {
                     shared
-                        .get_header_index_view(&block_hash, false)
+                        .get_header_view(&block_hash, false)
                         .map(|header| HeaderFields {
                             hash: header.hash(),
                             number: header.number(),

sync/src/synchronizer/block_fetcher.rs

@@ -196,7 +196,7 @@ impl BlockFetcher {
             end.saturating_sub(start) as usize + 1,
             state.read_inflight_blocks().peer_can_fetch_count(self.peer),
         );
-        let mut fetch = Vec::with_capacity(n_fetch);
+        let mut fetch: Vec<ckb_types::core::HeaderView> = Vec::with_capacity(n_fetch);
         let now = unix_time_as_millis();
         debug!(
             "finding which blocks to fetch, start: {}, end: {}, best_known: {}",
@@ -263,9 +263,7 @@ impl BlockFetcher {
                     .sync_shared
                     .active_chain()
                     .get_block_status(&parent_hash);
-                header = self
-                    .sync_shared
-                    .get_header_index_view(&parent_hash, false)?;
+                header = self.sync_shared.get_header_view(&parent_hash, false)?;
             }
 
             // Move `start` forward

sync/src/types/mod.rs

@@ -1144,14 +1144,14 @@ impl SyncShared {
         let snapshot = Arc::clone(&self.shared.snapshot());
         header_view.build_skip(
             tip_number,
-            |hash, store_first| self.get_header_index_view(hash, store_first),
+            |hash, store_first| self.get_header_view(hash, store_first),
             |number, current| {
                 // shortcut to return an ancestor block
                 if current.number <= snapshot.tip_number() && snapshot.is_main_chain(&current.hash)
                 {
                     snapshot
                         .get_block_hash(number)
-                        .and_then(|hash| self.get_header_index_view(&hash, true))
+                        .and_then(|hash| self.get_header_view(&hash, true))
                 } else {
                     None
                 }
@@ -1166,6 +1166,14 @@ impl SyncShared {
         self.may_set_shared_best_header(header_view);
     }
 
+    pub(crate) fn get_header_view(
+        &self,
+        hash: &Byte32,
+        store_first: bool,
+    ) -> Option<core::HeaderView> {
+        todo!("get header view");
+    }
+
     pub(crate) fn get_header_index_view(
         &self,
         hash: &Byte32,
@@ -1715,15 +1723,15 @@ impl ActiveChain {
         self.unverified_tip_header().number()
     }
 
-    pub fn get_ancestor(&self, base: &Byte32, number: BlockNumber) -> Option<HeaderIndexView> {
+    pub fn get_ancestor(&self, base: &Byte32, number: BlockNumber) -> Option<core::HeaderView> {
         self.get_ancestor_internal(base, number, false)
     }
 
     pub fn get_ancestor_with_unverified(
         &self,
         base: &Byte32,
         number: BlockNumber,
-    ) -> Option<HeaderIndexView> {
+    ) -> Option<core::HeaderView> {
         self.get_ancestor_internal(base, number, true)
     }
 
@@ -1732,7 +1740,7 @@ impl ActiveChain {
         base: &Byte32,
         number: BlockNumber,
         with_unverified: bool,
-    ) -> Option<HeaderIndexView> {
+    ) -> Option<core::HeaderView> {
         let tip_number = {
             if with_unverified {
                 self.unverified_tip_number()
@@ -1749,15 +1757,14 @@ impl ActiveChain {
             }
         };
 
-        let get_header_view_fn = |hash: &Byte32, store_first: bool| {
-            self.sync_shared.get_header_index_view(hash, store_first)
-        };
+        let get_header_view_fn =
+            |hash: &Byte32, store_first: bool| self.sync_shared.get_header_view(hash, store_first);
 
         let fast_scanner_fn = |number: BlockNumber, current: BlockNumberAndHash| {
             // shortcut to return an ancestor block
             if current.number <= tip_number && block_is_on_chain_fn(&current.hash) {
                 self.get_block_hash(number)
-                    .and_then(|hash| self.sync_shared.get_header_index_view(&hash, true))
+                    .and_then(|hash| self.sync_shared.get_header_view(&hash, true))
             } else {
                 None
             }