refactor: rename as_data_provider to borrow_as_data_loader

nervosnetwork · Mar 2, 2023 · 3aa3051 · 3aa3051
1 parent 0fad1b6
commit 3aa3051
Show file tree

Hide file tree

Showing 24 changed files with 77 additions and 75 deletions.
diff --git a/benches/benches/benchmarks/util.rs b/benches/benches/benchmarks/util.rs
@@ -177,7 +177,7 @@ pub fn gen_always_success_block(
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&p_block.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&p_block.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 
@@ -387,7 +387,7 @@ pub fn gen_secp_block(
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&p_block.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&p_block.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 
@@ -498,7 +498,7 @@ pub fn dao_data(shared: &Shared, parent: &HeaderView, txs: &[TransactionView]) -
         }
     });
     let rtxs = rtxs.expect("dao_data resolve_transaction");
-    let data_loader = snapshot.as_data_provider();
+    let data_loader = snapshot.borrow_as_data_loader();
     let calculator = DaoCalculator::new(snapshot.consensus(), &data_loader);
     calculator
         .dao_field(rtxs.iter(), parent)
@@ -511,7 +511,7 @@ pub(crate) fn calculate_reward(shared: &Shared, parent: &HeaderView) -> Capacity
     let target_number = shared.consensus().finalize_target(number).unwrap();
     let target_hash = snapshot.get_block_hash(target_number).unwrap();
     let target = snapshot.get_block_header(&target_hash).unwrap();
-    let data_loader = snapshot.as_data_provider();
+    let data_loader = snapshot.borrow_as_data_loader();
     let calculator = DaoCalculator::new(shared.consensus(), &data_loader);
     calculator
         .primary_block_reward(&target)

diff --git a/chain/src/chain.rs b/chain/src/chain.rs
@@ -401,7 +401,7 @@ impl ChainService {
         let next_block_epoch = self
             .shared
             .consensus()
-            .next_epoch_ext(&parent_header, &txn_snapshot.as_data_provider())
+            .next_epoch_ext(&parent_header, &txn_snapshot.borrow_as_data_loader())
             .expect("epoch should be stored");
         let new_epoch = next_block_epoch.is_head();
         let epoch = next_block_epoch.epoch();

diff --git a/chain/src/tests/basic.rs b/chain/src/tests/basic.rs
@@ -491,7 +491,7 @@ fn prepare_context_chain(
     for _ in 1..final_number - 1 {
         let epoch = shared
             .consensus()
-            .next_epoch_ext(&parent, &shared.store().as_data_provider())
+            .next_epoch_ext(&parent, &shared.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -526,7 +526,7 @@ fn prepare_context_chain(
     for i in 1..final_number {
         let epoch = shared
             .consensus()
-            .next_epoch_ext(&parent, &shared.store().as_data_provider())
+            .next_epoch_ext(&parent, &shared.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
         let mut uncles = vec![];
@@ -601,7 +601,7 @@ fn test_epoch_hash_rate_dampening() {
 
         let epoch = snapshot
             .consensus()
-            .next_epoch_ext(&tip, &snapshot.as_data_provider())
+            .next_epoch_ext(&tip, &snapshot.borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -638,7 +638,7 @@ fn test_epoch_hash_rate_dampening() {
 
         let epoch = snapshot
             .consensus()
-            .next_epoch_ext(&tip, &snapshot.as_data_provider())
+            .next_epoch_ext(&tip, &snapshot.borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -693,7 +693,7 @@ fn test_orphan_rate_estimation_overflow() {
 
         let epoch = snapshot
             .consensus()
-            .next_epoch_ext(&tip, &snapshot.as_data_provider())
+            .next_epoch_ext(&tip, &snapshot.borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -751,7 +751,7 @@ fn test_next_epoch_ext() {
 
         let epoch = snapshot
             .consensus()
-            .next_epoch_ext(&tip, &snapshot.as_data_provider())
+            .next_epoch_ext(&tip, &snapshot.borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -808,7 +808,7 @@ fn test_next_epoch_ext() {
 
         let epoch = snapshot
             .consensus()
-            .next_epoch_ext(&tip, &snapshot.as_data_provider())
+            .next_epoch_ext(&tip, &snapshot.borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -850,7 +850,7 @@ fn test_next_epoch_ext() {
         // last_duration 7980
         let epoch = snapshot
             .consensus()
-            .next_epoch_ext(&tip, &snapshot.as_data_provider())
+            .next_epoch_ext(&tip, &snapshot.borrow_as_data_loader())
             .unwrap()
             .epoch();
 

diff --git a/chain/src/tests/block_assembler.rs b/chain/src/tests/block_assembler.rs
@@ -236,7 +236,7 @@ fn test_prepare_uncles() {
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&block1_1.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&block1_1.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 
@@ -260,7 +260,7 @@ fn test_prepare_uncles() {
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&block2_1.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&block2_1.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 
@@ -317,7 +317,7 @@ fn test_candidate_uncles_retain() {
         let snapshot = shared.snapshot();
         let epoch = shared
             .consensus()
-            .next_epoch_ext(&block1_1.header(), &shared.store().as_data_provider())
+            .next_epoch_ext(&block1_1.header(), &shared.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
         let uncles = candidate_uncles.prepare_uncles(&snapshot, &epoch);
@@ -343,7 +343,7 @@ fn test_candidate_uncles_retain() {
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&block2_0.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&block2_0.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 
@@ -356,7 +356,7 @@ fn test_candidate_uncles_retain() {
         let snapshot = shared.snapshot();
         let epoch = shared
             .consensus()
-            .next_epoch_ext(&block3_0.header(), &shared.store().as_data_provider())
+            .next_epoch_ext(&block3_0.header(), &shared.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
         let uncles = candidate_uncles.prepare_uncles(&snapshot, &epoch);

diff --git a/chain/src/tests/cell.rs b/chain/src/tests/cell.rs
@@ -58,7 +58,7 @@ pub(crate) fn gen_block(
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(parent_header, &shared.store().as_data_provider())
+        .next_epoch_ext(parent_header, &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 

diff --git a/chain/src/tests/delay_verify.rs b/chain/src/tests/delay_verify.rs
@@ -256,7 +256,7 @@ fn test_full_dead_transaction() {
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&parent, &shared.store().as_data_provider())
+        .next_epoch_ext(&parent, &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 
@@ -284,7 +284,7 @@ fn test_full_dead_transaction() {
 
             let epoch = shared
                 .consensus()
-                .next_epoch_ext(&parent, &shared.store().as_data_provider())
+                .next_epoch_ext(&parent, &shared.store().borrow_as_data_loader())
                 .unwrap()
                 .epoch();
 
@@ -360,7 +360,7 @@ fn test_full_dead_transaction() {
 
                 let epoch = shared
                     .consensus()
-                    .next_epoch_ext(&parent, &shared.store().as_data_provider())
+                    .next_epoch_ext(&parent, &shared.store().borrow_as_data_loader())
                     .unwrap()
                     .epoch();
 

diff --git a/chain/src/tests/find_fork.rs b/chain/src/tests/find_fork.rs
@@ -349,7 +349,7 @@ fn repeatedly_switch_fork() {
     let parent = fork1.blocks().last().cloned().unwrap();
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&parent.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&parent.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
     let new_block1 = BlockBuilder::default()
@@ -368,7 +368,7 @@ fn repeatedly_switch_fork() {
     let mut parent = fork2.blocks().last().cloned().unwrap();
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&parent.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&parent.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
     let new_block2 = BlockBuilder::default()
@@ -384,7 +384,7 @@ fn repeatedly_switch_fork() {
         .unwrap();
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&parent.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&parent.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
     let new_block3 = BlockBuilder::default()
@@ -402,7 +402,7 @@ fn repeatedly_switch_fork() {
     parent = new_block1;
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&parent.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&parent.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
     let new_block4 = BlockBuilder::default()
@@ -419,7 +419,7 @@ fn repeatedly_switch_fork() {
     parent = new_block4;
     let epoch = shared
         .consensus()
-        .next_epoch_ext(&parent.header(), &shared.store().as_data_provider())
+        .next_epoch_ext(&parent.header(), &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
     let new_block5 = BlockBuilder::default()

diff --git a/chain/src/tests/non_contextual_block_txs_verify.rs b/chain/src/tests/non_contextual_block_txs_verify.rs
@@ -65,7 +65,7 @@ pub(crate) fn gen_block(
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(parent_header, &shared.store().as_data_provider())
+        .next_epoch_ext(parent_header, &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 

diff --git a/chain/src/tests/reward.rs b/chain/src/tests/reward.rs
@@ -84,7 +84,7 @@ pub(crate) fn gen_block(
 
     let epoch = shared
         .consensus()
-        .next_epoch_ext(parent_header, &shared.store().as_data_provider())
+        .next_epoch_ext(parent_header, &shared.store().borrow_as_data_loader())
         .unwrap()
         .epoch();
 

diff --git a/chain/src/tests/util.rs b/chain/src/tests/util.rs
@@ -164,7 +164,7 @@ pub(crate) fn calculate_reward(
     let target_number = consensus.finalize_target(number).unwrap();
     let target_hash = store.store().get_block_hash(target_number).unwrap();
     let target = store.store().get_block_header(&target_hash).unwrap();
-    let data_loader = store.store().as_data_provider();
+    let data_loader = store.store().borrow_as_data_loader();
     let calculator = DaoCalculator::new(consensus, &data_loader);
     calculator
         .primary_block_reward(&target)
@@ -354,7 +354,7 @@ impl<'a> MockChain<'a> {
 
         let epoch = self
             .consensus
-            .next_epoch_ext(&parent, &store.store().as_data_provider())
+            .next_epoch_ext(&parent, &store.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -383,7 +383,7 @@ impl<'a> MockChain<'a> {
 
         let epoch = self
             .consensus
-            .next_epoch_ext(&parent, &store.store().as_data_provider())
+            .next_epoch_ext(&parent, &store.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -407,7 +407,7 @@ impl<'a> MockChain<'a> {
 
         let epoch = self
             .consensus
-            .next_epoch_ext(&parent, &store.store().as_data_provider())
+            .next_epoch_ext(&parent, &store.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -431,7 +431,7 @@ impl<'a> MockChain<'a> {
 
         let epoch = self
             .consensus
-            .next_epoch_ext(&parent, &store.store().as_data_provider())
+            .next_epoch_ext(&parent, &store.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -454,7 +454,7 @@ impl<'a> MockChain<'a> {
 
         let epoch = self
             .consensus
-            .next_epoch_ext(&parent, &store.store().as_data_provider())
+            .next_epoch_ext(&parent, &store.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -478,7 +478,7 @@ impl<'a> MockChain<'a> {
 
         let epoch = self
             .consensus
-            .next_epoch_ext(&parent, &store.store().as_data_provider())
+            .next_epoch_ext(&parent, &store.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -514,7 +514,7 @@ impl<'a> MockChain<'a> {
 
         let epoch = self
             .consensus
-            .next_epoch_ext(&parent, &store.store().as_data_provider())
+            .next_epoch_ext(&parent, &store.store().borrow_as_data_loader())
             .unwrap()
             .epoch();
 
@@ -584,7 +584,7 @@ pub fn dao_data(
     } else {
         rtxs.unwrap()
     };
-    let data_loader = store.store().as_data_provider();
+    let data_loader = store.store().borrow_as_data_loader();
     let calculator = DaoCalculator::new(consensus, &data_loader);
     calculator.dao_field(rtxs.iter(), parent).unwrap()
 }
diff --git a/rpc/src/module/experiment.rs b/rpc/src/module/experiment.rs
@@ -180,7 +180,7 @@ impl ExperimentRpc for ExperimentRpcImpl {
         let snapshot: &Snapshot = &self.shared.snapshot();
         let consensus = snapshot.consensus();
         let out_point: packed::OutPoint = out_point.into();
-        let data_loader = snapshot.as_data_provider();
+        let data_loader = snapshot.borrow_as_data_loader();
         let calculator = DaoCalculator::new(consensus, &data_loader);
         match kind {
             DaoWithdrawingCalculationKind::WithdrawingHeaderHash(withdrawing_header_hash) => {

diff --git a/rpc/src/module/test.rs b/rpc/src/module/test.rs
@@ -585,10 +585,12 @@ impl IntegrationTestRpc for IntegrationTestRpcImpl {
             })
             .collect::<Result<Vec<ResolvedTransaction>>>()?;
 
-        Ok(DaoCalculator::new(consensus, &snapshot.as_data_provider())
-            .dao_field(rtxs.iter(), &parent_header)
-            .expect("dao calculation should be OK")
-            .into())
+        Ok(
+            DaoCalculator::new(consensus, &snapshot.borrow_as_data_loader())
+                .dao_field(rtxs.iter(), &parent_header)
+                .expect("dao calculation should be OK")
+                .into(),
+        )
     }
 }
 

diff --git a/rpc/src/tests/mod.rs b/rpc/src/tests/mod.rs
@@ -163,7 +163,7 @@ fn next_block(shared: &Shared, parent: &HeaderView) -> BlockView {
     let snapshot: &Snapshot = &shared.snapshot();
     let epoch = shared
         .consensus()
-        .next_epoch_ext(parent, &snapshot.as_data_provider())
+        .next_epoch_ext(parent, &snapshot.borrow_as_data_loader())
         .unwrap()
         .epoch();
     let (_, reward) = RewardCalculator::new(snapshot.consensus(), snapshot)
@@ -174,7 +174,7 @@ fn next_block(shared: &Shared, parent: &HeaderView) -> BlockView {
     let dao = {
         let resolved_cellbase =
             resolve_transaction(cellbase.clone(), &mut HashSet::new(), snapshot, snapshot).unwrap();
-        let data_loader = shared.store().as_data_provider();
+        let data_loader = shared.store().borrow_as_data_loader();
         DaoCalculator::new(shared.consensus(), &data_loader)
             .dao_field([resolved_cellbase].iter(), parent)
             .unwrap()

diff --git a/store/src/store.rs b/store/src/store.rs
@@ -32,8 +32,8 @@ pub trait ChainStore: Send + Sync + Sized {
     fn get(&self, col: Col, key: &[u8]) -> Option<DBPinnableSlice>;
     /// TODO(doc): @quake
     fn get_iter(&self, col: Col, mode: IteratorMode) -> DBIter;
-    /// Return the provider trait default implementation
-    fn as_data_provider(&self) -> BorrowedDataLoaderWrapper<Self> {
+    /// Return the borrowed data loader wrapper
+    fn borrow_as_data_loader(&self) -> BorrowedDataLoaderWrapper<Self> {
         BorrowedDataLoaderWrapper::new(self)
     }