Merge pull request #4160 from eval-exec/exec/remove-disable_faketime_cfg

Remove useless `--cfg disable_faketime` from `RUSTFLAGS`

Author: quake

Makefile

@@ -140,19 +140,19 @@ build-for-profiling: ## Build binary with for profiling.
 
 .PHONY: prod
 prod: ## Build binary for production release.
-	RUSTFLAGS="$${RUSTFLAGS} --cfg disable_faketime" cargo build ${VERBOSE} ${CKB_BUILD_TARGET} --profile prod --features "with_sentry,with_dns_seeding"
+	cargo build ${VERBOSE} ${CKB_BUILD_TARGET} --profile prod --features "with_sentry,with_dns_seeding"
 
 .PHONY: prod_portable
 prod_portable: ## Build binary for portable production release.
-	RUSTFLAGS="$${RUSTFLAGS} --cfg disable_faketime" cargo build ${VERBOSE} ${CKB_BUILD_TARGET} --profile prod --features "with_sentry,with_dns_seeding,portable"
+	cargo build ${VERBOSE} ${CKB_BUILD_TARGET} --profile prod --features "with_sentry,with_dns_seeding,portable"
 
 .PHONY: prod-docker
 prod-docker:
-	RUSTFLAGS="$${RUSTFLAGS} --cfg disable_faketime --cfg docker" cargo build --verbose ${CKB_BUILD_TARGET} --profile prod --features "with_sentry,with_dns_seeding"
+	RUSTFLAGS="$${RUSTFLAGS} --cfg docker" cargo build --verbose ${CKB_BUILD_TARGET} --profile prod --features "with_sentry,with_dns_seeding"
 
 .PHONY: prod-test
 prod-test:
-	RUSTFLAGS="$${RUSTFLAGS} --cfg disable_faketime" RUSTDOCFLAGS="--cfg disable_faketime" CKB_FEATURES="with_sentry,with_dns_seeding" $(MAKE) test
+	CKB_FEATURES="with_sentry,with_dns_seeding" $(MAKE) test
 
 .PHONY: prod-with-debug
 prod-with-debug:

chain/src/tests/block_assembler.rs

@@ -128,7 +128,6 @@ fn create_cellbase(number: BlockNumber, epoch: &EpochExt) -> TransactionView {
         .build()
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_block_template_timestamp() {
     let mut _faketime_guard = ckb_systemtime::faketime();

devtools/windows/make.ps1

@@ -57,7 +57,7 @@ function Disable-DebugSymbols {
 }
 
 function run-prod {
-  Set-Env RUSTFLAGS "--cfg disable_faketime"
+  Set-Env RUSTFLAGS ""
   cargo build @Verbose --release
 }
 

network/src/tests/peer_store.rs

@@ -82,7 +82,6 @@ fn test_update_status() {
     );
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_ban_peer() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -122,7 +121,6 @@ fn test_ban_peer() {
     assert_eq!(peer_store.ban_list().count(), 1)
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_attempt_ban() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -156,7 +154,6 @@ fn test_attempt_ban() {
     );
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_fetch_addrs_to_attempt() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -189,7 +186,6 @@ fn test_fetch_addrs_to_attempt() {
         .is_empty());
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_fetch_addrs_to_attempt_or_feeler() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -217,7 +213,6 @@ fn test_fetch_addrs_to_attempt_or_feeler() {
     assert_eq!(peer_store.fetch_addrs_to_feeler(2).len(), 1);
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_fetch_addrs_to_attempt_in_last_minutes() {
     let _faketime_guard = ckb_systemtime::faketime();

sync/src/tests/inflight_blocks.rs

@@ -87,7 +87,6 @@ fn inflight_blocks_state() {
     );
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn inflight_blocks_timeout() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -140,7 +139,6 @@ fn inflight_blocks_timeout() {
     );
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn inflight_trace_number_state() {
     let _faketime_guard = ckb_systemtime::faketime();

sync/src/tests/mod.rs

@@ -17,7 +17,7 @@ mod inflight_blocks;
 mod net_time_checker;
 mod orphan_block_pool;
 mod sync_shared;
-#[cfg(not(disable_faketime))]
+
 mod synchronizer;
 mod types;
 mod util;

sync/src/tests/synchronizer/functions.rs

@@ -695,7 +695,6 @@ fn test_sync_process() {
     );
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_header_sync_timeout() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -747,7 +746,6 @@ fn test_header_sync_timeout() {
     )
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_chain_sync_timeout() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -945,7 +943,6 @@ fn test_chain_sync_timeout() {
     }
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_n_sync_started() {
     let _faketime_guard = ckb_systemtime::faketime();

verification/contextual/src/tests/mod.rs

@@ -1,3 +1,3 @@
 mod contextual_block_verifier;
-#[cfg(not(disable_faketime))]
+
 mod uncle_verifier;

verification/src/tests/header_verifier.rs

@@ -61,7 +61,6 @@ pub fn test_version() {
     assert!(verifier.verify().is_ok());
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_timestamp() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -82,7 +81,6 @@ fn test_timestamp() {
     assert!(timestamp_verifier.verify().is_ok());
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_timestamp_too_old() {
     let _faketime_guard = ckb_systemtime::faketime();
@@ -111,7 +109,6 @@ fn test_timestamp_too_old() {
     );
 }
 
-#[cfg(not(disable_faketime))]
 #[test]
 fn test_timestamp_too_new() {
     let _faketime_guard = ckb_systemtime::faketime();