Remove nervosnetwork/faketime, replace cargo test by nextest-rs/nextest

.github/workflows/ci_unit_tests_macos.yaml

@@ -52,6 +52,8 @@ jobs:
     needs: prologue
     runs-on: macos-11
     steps:
+    - name: Install nextest
+      uses: taiki-e/install-action@nextest
     - uses: actions/checkout@v3
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then

.github/workflows/ci_unit_tests_ubuntu.yaml

@@ -57,6 +57,8 @@ jobs:
         profile: minimal
         toolchain: 1.61.0
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
+    - name: Install nextest
+      uses: taiki-e/install-action@nextest
     - uses: actions/checkout@v3
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then

.github/workflows/ci_unit_tests_windows.yaml

@@ -63,6 +63,11 @@ jobs:
         scoop install git
         scoop bucket add extras
         scoop install llvm yasm
+    - name: Install cargo-nextest
+      run: |
+        scoop install wget
+        wget https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-0.9.36/cargo-nextest-0.9.36-x86_64-pc-windows-msvc.zip
+        7z x cargo-nextest-0.9.36-x86_64-pc-windows-msvc.zip -oC:\Users\Administrator\.cargo\bin -y
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
             devtools/ci/ci_main.sh

Cargo.toml

@@ -25,6 +25,7 @@ members = [
     "util",
     "util/occupied-capacity/core",
     "util/channel",
+    "util/systemtime",
     "util/fixed-hash/core",
     "util/build-info",
     "util/logger",

Makefile

@@ -19,13 +19,19 @@ GRCOV_EXCL_STOP  = ^\s*\)(;)?$$
 GRCOV_EXCL_LINE = \s*(((log|ckg_logger)::)?(trace|debug|info|warn|error)|(debug_)?assert(_eq|_ne|_error_eq))!\(.*\)(;)?$$
 
 ##@ Testing
+.PHONY: doc-test
+doc-test: ## Run doc tests
+	cargo test --all --doc
+
 .PHONY: test
-test: quick-test ## Run all tests, including some tests can be time-consuming to execute (tagged with [ignore])
-	cargo test ${VERBOSE} --features ${CKB_FEATURES} --all -- --nocapture --ignored
+test: ## Run all tests, including some tests can be time-consuming to execute (tagged with [ignore])
+	cargo nextest run ${VERBOSE} --features ${CKB_FEATURES} --workspace --hide-progress-bar --success-output immediate-final --failure-output immediate-final --run-ignored all
+	$(MAKE) doc-test
 
 .PHONY: quick-test
 quick-test: ## Run all tests, excluding some tests can be time-consuming to execute (tagged with [ignore])
-	cargo test ${VERBOSE} --features ${CKB_FEATURES} --all -- --nocapture
+	cargo nextest run ${VERBOSE} --features ${CKB_FEATURES} --workspace --hide-progress-bar --success-output immediate-final --failure-output immediate-final --run-ignored default
+	$(MAKE) doc-test
 
 .PHONY: cov-install-tools
 cov-install-tools:

chain/Cargo.toml

@@ -18,7 +18,7 @@ ckb-store = { path = "../store", version = "= 0.107.0-pre" }
 ckb-verification = { path = "../verification", version = "= 0.107.0-pre" }
 ckb-verification-contextual = { path = "../verification/contextual", version = "= 0.107.0-pre" }
 ckb-verification-traits = { path = "../verification/traits", version = "= 0.107.0-pre" }
-faketime = "0.2.0"
+ckb-systemtime = { path = "../util/systemtime", version = "= 0.107.0-pre" }
 ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.107.0-pre" }
 ckb-dao = { path = "../util/dao", version = "= 0.107.0-pre" }
 ckb-proposal-table = { path = "../util/proposal-table", version = "= 0.107.0-pre" }
@@ -39,6 +39,7 @@ ckb-network = { path = "../network", version = "= 0.107.0-pre" }
 ckb-launcher = { path = "../util/launcher", version = "= 0.107.0-pre" }
 lazy_static = "1.4"
 tempfile = "3.0"
+ckb-systemtime = { path = "../util/systemtime", version = "= 0.107.0-pre" ,features = ["enable_faketime"]}
 
 [features]
 default = []

chain/src/chain.rs

@@ -15,6 +15,7 @@ use ckb_rust_unstable_port::IsSorted;
 use ckb_shared::shared::Shared;
 use ckb_stop_handler::{SignalSender, StopHandler};
 use ckb_store::{attach_block_cell, detach_block_cell, ChainStore, StoreTransaction};
+use ckb_systemtime::unix_time_as_millis;
 use ckb_types::{
     core::{
         cell::{
@@ -32,7 +33,6 @@ use ckb_verification::cache::Completed;
 use ckb_verification::{BlockVerifier, InvalidParentError, NonContextualBlockTxsVerifier};
 use ckb_verification_contextual::{ContextualBlockVerifier, VerifyContext};
 use ckb_verification_traits::{Switch, Verifier};
-use faketime::unix_time_as_millis;
 use std::collections::{HashSet, VecDeque};
 use std::sync::Arc;
 use std::{cmp, thread};

chain/src/tests/block_assembler.rs

@@ -131,8 +131,8 @@ fn create_cellbase(number: BlockNumber, epoch: &EpochExt) -> TransactionView {
 #[cfg(not(disable_faketime))]
 #[test]
 fn test_block_template_timestamp() {
-    let faketime_file = faketime::millis_tempfile(0).expect("create faketime file");
-    ::std::env::set_var("FAKETIME", faketime_file.as_os_str());
+    let mut _faketime_guard = ckb_systemtime::faketime();
+    _faketime_guard.set_faketime(0);
 
     let consensus = Consensus::default();
     let epoch = consensus.genesis_epoch_ext().clone();

chain/src/tests/find_fork.rs

@@ -3,14 +3,14 @@ use crate::tests::util::{MockChain, MockStore};
 use ckb_chain_spec::consensus::{Consensus, ProposalWindow};
 use ckb_launcher::SharedBuilder;
 use ckb_store::ChainStore;
+use ckb_systemtime::unix_time_as_millis;
 use ckb_types::{
     core::{BlockBuilder, BlockExt, BlockView},
     packed,
     prelude::Pack,
     U256,
 };
 use ckb_verification_traits::Switch;
-use faketime::unix_time_as_millis;
 use std::collections::HashSet;
 use std::sync::Arc;
 

network/Cargo.toml

@@ -19,7 +19,7 @@ ckb-metrics = {path = "../util/metrics", version = "= 0.107.0-pre"}
 tokio = { version = "1", features = ["sync", "macros"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 futures = "0.3"
-faketime = "0.2.0"
+ckb-systemtime = {path = "../util/systemtime", version = "= 0.107.0-pre"}
 lazy_static = { version = "1.3.0", optional = true }
 bs58 = { version = "0.4.0", optional = true }
 sentry = { version = "0.26.0", optional = true }
@@ -48,6 +48,7 @@ criterion = "0.4"
 proptest = "1.0"
 num_cpus = "1.10"
 once_cell = "1.8.0"
+ckb-systemtime = {path = "../util/systemtime", version = "= 0.107.0-pre", features = ["enable_faketime"]}
 
 [[bench]]
 name = "peer_store"

network/src/peer_store/addr_manager.rs

@@ -52,7 +52,7 @@ impl AddrManager {
         let mut duplicate_ips = HashSet::new();
         let mut addr_infos = Vec::with_capacity(count);
         let mut rng = rand::thread_rng();
-        let now_ms = faketime::unix_time_as_millis();
+        let now_ms = ckb_systemtime::unix_time_as_millis();
         for i in 0..self.random_ids.len() {
             // reuse the for loop to shuffle random ids
             // https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle

network/src/peer_store/ban_list.rs

@@ -1,7 +1,7 @@
 //! Ban list
 use crate::peer_store::types::{ip_to_network, BannedAddr};
 use crate::peer_store::Multiaddr;
-use faketime::unix_time_as_millis;
+use ckb_systemtime::unix_time_as_millis;
 use ipnetwork::IpNetwork;
 use p2p::utils::multiaddr_to_socketaddr;
 use std::collections::HashMap;