Use generate_epochs for dao related integration test

Signed-off-by: Eval EXEC <execvy@gmail.com>
nervosnetwork · Mar 4, 2024 · 81fa55e · 81fa55e
1 parent a08c298
commit 81fa55e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/test/src/miner.rs b/test/src/miner.rs
@@ -1,6 +1,6 @@
 use crate::util::temp_dir;
 use ckb_app_config::BlockAssemblerConfig;
-use ckb_jsonrpc_types::{BlockTemplate, ProposalShortId};
+use ckb_jsonrpc_types::{BlockTemplate, EpochNumberWithFraction, ProposalShortId};
 use ckb_sdk::{Address, AddressPayload, CkbRpcClient, NetworkType};
 use ckb_types::{
     core::BlockNumber,
@@ -48,6 +48,16 @@ impl Miner {
             .expect("RPC generate_block")
     }
 
+    pub fn generate_epochs(&self, num_epochs: u64, epoch_length: u64) -> EpochNumberWithFraction {
+        let epoch_number_with_fraction =
+            ckb_types::core::EpochNumberWithFraction::new(num_epochs, 0, epoch_length);
+        self.rpc
+            .lock()
+            .unwrap()
+            .generate_epochs(epoch_number_with_fraction.into())
+            .expect("RPC generate_epoch")
+    }
+
     pub fn generate_blocks(&self, count: u64) {
         log::info!("generating {} blocks...", count);
         (0..count).for_each(|_| {

diff --git a/test/src/spec/dao.rs b/test/src/spec/dao.rs
@@ -39,7 +39,7 @@ impl Spec for DaoPrepareOne {
         // Drive the chain until since mature and then withdraw
         setup
             .miner()
-            .generate_blocks(LOCK_PERIOD_EPOCHES * EPOCH_LENGTH);
+            .generate_epochs(LOCK_PERIOD_EPOCHES, EPOCH_LENGTH);
         let out_points = vec![new_out_point(prepare_tx_hash, 0)];
         let _withdraw_tx_hash = withdraw(setup, &out_points);
         assert_eq!(deposited_capacity(setup), 0);
@@ -89,7 +89,7 @@ impl Spec for DaoPrepareMultiple {
         // Drive the chain until since mature and then withdraw
         setup
             .miner()
-            .generate_blocks(LOCK_PERIOD_EPOCHES * EPOCH_LENGTH);
+            .generate_epochs(LOCK_PERIOD_EPOCHES, EPOCH_LENGTH);
         let out_points = (0..shannons.len())
             .map(|i| new_out_point(&prepare_tx_hash, i))
             .collect::<Vec<_>>();
@@ -135,7 +135,7 @@ impl Spec for DaoWithdrawMultiple {
         // Drive the chain until since mature and then withdraw
         setup
             .miner()
-            .generate_blocks(LOCK_PERIOD_EPOCHES * EPOCH_LENGTH);
+            .generate_epochs(LOCK_PERIOD_EPOCHES, EPOCH_LENGTH);
         let out_points = prepare_tx_hashes
             .into_iter()
             .map(|hash| new_out_point(hash, 0))