From 61cec49e903472d4b45d3131c570aaff811358d3 Mon Sep 17 00:00:00 2001 From: Shreyan Gupta Date: Mon, 12 Feb 2024 20:40:38 +0530 Subject: [PATCH] [test] Have real epoch_manager as default for tests (#10598) In an effort to kill mock epoch manager, this PR makes the default test environment have real epoch managers. All tests that still do require a mock epoch manager (for whatever reason), can call `builder.mock_epoch_managers()`. Over time we would slowly like to get rid of all calls to `mock_epoch_managers()` --- chain/client/src/sync/block.rs | 6 +- .../client/src/test_utils/test_env_builder.rs | 38 +--- chain/client/src/tests/doomslug.rs | 6 +- chain/client/src/tests/process_blocks.rs | 8 +- .../src/tests/client/benchmarks.rs | 5 +- .../src/tests/client/block_corruption.rs | 10 +- .../src/tests/client/challenges.rs | 24 +-- .../src/tests/client/cold_storage.rs | 17 +- .../src/tests/client/epoch_sync.rs | 11 +- .../access_key_nonce_for_implicit_accounts.rs | 24 +-- .../account_id_in_function_call_permission.rs | 2 - .../client/features/adversarial_behaviors.rs | 1 - .../client/features/chunk_nodes_cache.rs | 1 - .../tests/client/features/delegate_action.rs | 5 +- .../features/fix_contract_loading_cost.rs | 1 - .../client/features/fix_storage_usage.rs | 5 +- .../src/tests/client/features/flat_storage.rs | 1 - .../tests/client/features/in_memory_tries.rs | 3 - .../features/increase_deployment_cost.rs | 1 - .../features/increase_storage_compute_cost.rs | 1 - .../limit_contract_functions_number.rs | 1 - .../features/lower_storage_key_limit.rs | 1 - .../src/tests/client/features/nearvm.rs | 1 - ...restore_receipts_after_fix_apply_chunks.rs | 5 +- .../src/tests/client/features/restrict_tla.rs | 1 - .../client/features/stateless_validation.rs | 2 +- .../tests/client/features/wallet_contract.rs | 10 +- .../client/features/zero_balance_account.rs | 11 +- .../src/tests/client/flat_storage.rs | 6 +- .../src/tests/client/process_blocks.rs | 186 +++++------------- .../src/tests/client/resharding.rs | 2 +- .../src/tests/client/runtimes.rs | 11 +- integration-tests/src/tests/client/sandbox.rs | 5 +- .../src/tests/client/state_dump.rs | 2 - .../src/tests/client/state_snapshot.rs | 1 - .../src/tests/client/sync_state_nodes.rs | 1 - .../src/tests/client/undo_block.rs | 7 +- tools/state-viewer/src/state_dump.rs | 2 - 38 files changed, 112 insertions(+), 313 deletions(-) diff --git a/chain/client/src/sync/block.rs b/chain/client/src/sync/block.rs index 22e521834cf..be09f8438cc 100644 --- a/chain/client/src/sync/block.rs +++ b/chain/client/src/sync/block.rs @@ -369,7 +369,8 @@ mod test { BlockSync::new(network_adapter.clone().into(), block_fetch_horizon, false, true); let mut genesis_config = GenesisConfig::test(); genesis_config.epoch_length = 100; - let mut env = TestEnv::builder(&genesis_config).clients_count(2).build(); + let mut env = + TestEnv::builder(&genesis_config).clients_count(2).mock_epoch_managers().build(); let mut blocks = vec![]; for i in 1..5 * MAX_BLOCK_REQUESTS + 1 { let block = env.clients[0].produce_block(i as u64).unwrap().unwrap(); @@ -448,7 +449,8 @@ mod test { BlockSync::new(network_adapter.clone().into(), block_fetch_horizon, true, true); let mut genesis_config = GenesisConfig::test(); genesis_config.epoch_length = 5; - let mut env = TestEnv::builder(&genesis_config).clients_count(2).build(); + let mut env = + TestEnv::builder(&genesis_config).clients_count(2).mock_epoch_managers().build(); let mut blocks = vec![]; for i in 1..41 { let block = env.clients[0].produce_block(i).unwrap().unwrap(); diff --git a/chain/client/src/test_utils/test_env_builder.rs b/chain/client/src/test_utils/test_env_builder.rs index 3210c9114da..d8412931d57 100644 --- a/chain/client/src/test_utils/test_env_builder.rs +++ b/chain/client/src/test_utils/test_env_builder.rs @@ -199,29 +199,6 @@ impl TestEnvBuilder { } } - /// Specifies custom MockEpochManager for each client. This allows us to - /// construct [`TestEnv`] with a custom implementation. - /// - /// The vector must have the same number of elements as they are clients - /// (one by default). If that does not hold, [`Self::build`] method will - /// panic. - pub fn mock_epoch_managers(mut self, epoch_managers: Vec>) -> Self { - assert_eq!(epoch_managers.len(), self.clients.len()); - assert!(self.epoch_managers.is_none(), "Cannot override twice"); - assert!( - self.num_shards.is_none(), - "Cannot set both num_shards and epoch_managers at the same time" - ); - assert!( - self.shard_trackers.is_none(), - "Cannot override epoch_managers after shard_trackers" - ); - assert!(self.runtimes.is_none(), "Cannot override epoch_managers after runtimes"); - self.epoch_managers = - Some(epoch_managers.into_iter().map(|epoch_manager| epoch_manager.into()).collect()); - self - } - /// Specifies custom EpochManagerHandle for each client. This allows us to /// construct [`TestEnv`] with a custom implementation. /// @@ -245,12 +222,8 @@ impl TestEnvBuilder { self } - pub fn real_epoch_managers(self) -> Self { - self.real_epoch_managers_with_test_overrides(None) - } - /// Constructs real EpochManager implementations for each instance. - pub fn real_epoch_managers_with_test_overrides( + pub fn epoch_managers_with_test_overrides( self, test_overrides: Option, ) -> Self { @@ -273,10 +246,17 @@ impl TestEnvBuilder { /// Internal impl to make sure EpochManagers are initialized. fn ensure_epoch_managers(self) -> Self { - let mut ret = self.ensure_stores(); + let ret = self.ensure_stores(); if ret.epoch_managers.is_some() { return ret; } + ret.epoch_managers_with_test_overrides(None) + } + + /// Constructs MockEpochManager implementations for each instance. + pub fn mock_epoch_managers(self) -> Self { + assert!(self.epoch_managers.is_none(), "Cannot override twice"); + let mut ret = self.ensure_stores(); let epoch_managers: Vec = (0..ret.clients.len()) .map(|i| { let vs = ValidatorSchedule::new_with_shards(ret.num_shards.unwrap_or(1)) diff --git a/chain/client/src/tests/doomslug.rs b/chain/client/src/tests/doomslug.rs index c1855622801..f49b155c9c3 100644 --- a/chain/client/src/tests/doomslug.rs +++ b/chain/client/src/tests/doomslug.rs @@ -19,7 +19,11 @@ use near_primitives::validator_signer::InMemoryValidatorSigner; fn test_processing_skips_on_forks() { init_test_logger(); - let mut env = TestEnv::default_builder().clients_count(2).validator_seats(2).build(); + let mut env = TestEnv::default_builder() + .clients_count(2) + .validator_seats(2) + .mock_epoch_managers() + .build(); let b1 = env.clients[1].produce_block(1).unwrap().unwrap(); let b2 = env.clients[0].produce_block(2).unwrap().unwrap(); assert_eq!(b1.header().prev_hash(), b2.header().prev_hash()); diff --git a/chain/client/src/tests/process_blocks.rs b/chain/client/src/tests/process_blocks.rs index c12331bb098..6e6ac39f41c 100644 --- a/chain/client/src/tests/process_blocks.rs +++ b/chain/client/src/tests/process_blocks.rs @@ -18,7 +18,7 @@ use std::sync::Arc; /// if the second block is not requested #[test] fn test_not_process_height_twice() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let block = env.clients[0].produce_block(1).unwrap().unwrap(); // modify the block and resign it let mut duplicate_block = block.clone(); @@ -53,7 +53,7 @@ fn test_not_process_height_twice() { /// Test that if a block contains chunks with invalid shard_ids, the client will return error. #[test] fn test_bad_shard_id() { - let mut env = TestEnv::default_builder().num_shards(4).build(); + let mut env = TestEnv::default_builder().num_shards(4).mock_epoch_managers().build(); let prev_block = env.clients[0].produce_block(1).unwrap().unwrap(); env.process_block(0, prev_block, Provenance::PRODUCED); let mut block = env.clients[0].produce_block(2).unwrap().unwrap(); // modify the block and resign it @@ -98,7 +98,7 @@ fn test_bad_shard_id() { /// Test that if a block's content (vrf_value) is corrupted, the invalid block will not affect the node's block processing #[test] fn test_bad_block_content_vrf() { - let mut env = TestEnv::default_builder().num_shards(4).build(); + let mut env = TestEnv::default_builder().num_shards(4).mock_epoch_managers().build(); let prev_block = env.clients[0].produce_block(1).unwrap().unwrap(); env.process_block(0, prev_block, Provenance::PRODUCED); let block = env.clients[0].produce_block(2).unwrap().unwrap(); @@ -122,7 +122,7 @@ fn test_bad_block_content_vrf() { /// Test that if a block's signature is corrupted, the invalid block will not affect the node's block processing #[test] fn test_bad_block_signature() { - let mut env = TestEnv::default_builder().num_shards(4).build(); + let mut env = TestEnv::default_builder().num_shards(4).mock_epoch_managers().build(); let prev_block = env.clients[0].produce_block(1).unwrap().unwrap(); env.process_block(0, prev_block, Provenance::PRODUCED); let block = env.clients[0].produce_block(2).unwrap().unwrap(); diff --git a/integration-tests/src/tests/client/benchmarks.rs b/integration-tests/src/tests/client/benchmarks.rs index d044bc47664..e32b0b4011f 100644 --- a/integration-tests/src/tests/client/benchmarks.rs +++ b/integration-tests/src/tests/client/benchmarks.rs @@ -28,10 +28,7 @@ fn benchmark_large_chunk_production_time() { let tx_size = 3 * mb; let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let account_id = env.get_client_id(0).clone(); let signer = diff --git a/integration-tests/src/tests/client/block_corruption.rs b/integration-tests/src/tests/client/block_corruption.rs index 03761a003be..0f49648c116 100644 --- a/integration-tests/src/tests/client/block_corruption.rs +++ b/integration-tests/src/tests/client/block_corruption.rs @@ -37,10 +37,7 @@ fn change_shard_id_to_invalid() { let epoch_length = 5000000; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let mut last_block = env.clients[0].chain.get_block_by_height(0).unwrap(); @@ -179,10 +176,7 @@ fn check_process_flipped_block_fails_on_bit( let epoch_length = 5000000; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let mut last_block = env.clients[0].chain.get_block_by_height(0).unwrap(); diff --git a/integration-tests/src/tests/client/challenges.rs b/integration-tests/src/tests/client/challenges.rs index f9d65796589..d921e8d9d28 100644 --- a/integration-tests/src/tests/client/challenges.rs +++ b/integration-tests/src/tests/client/challenges.rs @@ -31,7 +31,7 @@ use nearcore::test_utils::TestEnvNightshadeSetupExt; /// TODO (#2445): Enable challenges when they are working correctly. #[test] fn test_block_with_challenges() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let genesis = env.clients[0].chain.get_block_by_height(0).unwrap(); let mut block = env.clients[0].produce_block(1).unwrap().unwrap(); @@ -60,10 +60,7 @@ fn test_block_with_challenges() { #[test] fn test_invalid_chunk_state() { let genesis = Genesis::test(vec!["test0".parse().unwrap()], 1); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); env.produce_block(0, 1); let block_hash = env.clients[0].chain.get_block_hash_by_height(1).unwrap(); @@ -86,7 +83,7 @@ fn test_invalid_chunk_state() { #[test] fn test_verify_block_double_sign_challenge() { - let mut env = TestEnv::default_builder().clients_count(2).build(); + let mut env = TestEnv::default_builder().clients_count(2).mock_epoch_managers().build(); env.produce_block(0, 1); let genesis = env.clients[0].chain.get_block_by_height(0).unwrap(); let b1 = env.clients[0].produce_block(2).unwrap().unwrap(); @@ -195,7 +192,7 @@ fn create_invalid_proofs_chunk(client: &mut Client) -> (ProduceChunkResult, Bloc #[test] fn test_verify_chunk_invalid_proofs_challenge() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); env.produce_block(0, 1); let (ProduceChunkResult { chunk, .. }, block) = create_invalid_proofs_chunk(&mut env.clients[0]); @@ -208,7 +205,7 @@ fn test_verify_chunk_invalid_proofs_challenge() { #[test] fn test_verify_chunk_invalid_proofs_challenge_decoded_chunk() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); env.produce_block(0, 1); let (ProduceChunkResult { chunk: encoded_chunk, .. }, block) = create_invalid_proofs_chunk(&mut env.clients[0]); @@ -223,7 +220,7 @@ fn test_verify_chunk_invalid_proofs_challenge_decoded_chunk() { #[test] fn test_verify_chunk_proofs_malicious_challenge_no_changes() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); env.produce_block(0, 1); // Valid chunk let (ProduceChunkResult { chunk, .. }, block) = create_chunk(&mut env.clients[0], None, None); @@ -236,7 +233,7 @@ fn test_verify_chunk_proofs_malicious_challenge_no_changes() { #[test] fn test_verify_chunk_proofs_malicious_challenge_valid_order_transactions() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); env.produce_block(0, 1); let genesis_hash = *env.clients[0].chain.genesis().hash(); @@ -272,7 +269,7 @@ fn test_verify_chunk_proofs_malicious_challenge_valid_order_transactions() { #[test] fn test_verify_chunk_proofs_challenge_transaction_order() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); env.produce_block(0, 1); let genesis_hash = *env.clients[0].chain.genesis().hash(); @@ -334,10 +331,7 @@ fn challenge( fn test_verify_chunk_invalid_state_challenge() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.min_gas_price = 0; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); let validator_signer = create_test_signer("test0"); let genesis_hash = *env.clients[0].chain.genesis().hash(); diff --git a/integration-tests/src/tests/client/cold_storage.rs b/integration-tests/src/tests/client/cold_storage.rs index 6daa98b3fe5..67028513690 100644 --- a/integration-tests/src/tests/client/cold_storage.rs +++ b/integration-tests/src/tests/client/cold_storage.rs @@ -121,10 +121,7 @@ fn test_storage_after_commit_of_cold_update() { let mut genesis = Genesis::test(vec![test0(), test1()], 1); genesis.config.epoch_length = epoch_length; genesis.config.min_gas_price = 0; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let (storage, ..) = create_test_node_storage_with_cold(DB_VERSION, DbKind::Hot); let cold_db = storage.cold_db().unwrap(); @@ -233,7 +230,6 @@ fn test_cold_db_head_update() { let cold_db = storage.cold_db().unwrap(); let mut env = TestEnv::builder(&genesis.config) .stores(vec![hot_store.clone()]) - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); @@ -267,10 +263,7 @@ fn test_cold_db_copy_with_height_skips() { let mut genesis = Genesis::test(vec![test0(), test1()], 1); genesis.config.epoch_length = epoch_length; genesis.config.min_gas_price = 0; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let (storage, ..) = create_test_node_storage_with_cold(DB_VERSION, DbKind::Hot); let cold_db = storage.cold_db().unwrap(); @@ -364,10 +357,7 @@ fn test_initial_copy_to_cold(batch_size: usize) { let mut genesis = Genesis::test(vec![test0(), test1()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let (storage, ..) = create_test_node_storage_with_cold(DB_VERSION, DbKind::Archive); @@ -449,7 +439,6 @@ fn test_cold_loop_on_gc_boundary() { .archive(true) .save_trie_changes(true) .stores(vec![hot_store.clone()]) - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/epoch_sync.rs b/integration-tests/src/tests/client/epoch_sync.rs index 6a676859ed1..004b4c6e853 100644 --- a/integration-tests/src/tests/client/epoch_sync.rs +++ b/integration-tests/src/tests/client/epoch_sync.rs @@ -91,10 +91,7 @@ fn test_continuous_epoch_sync_info_population() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let mut last_hash = *env.clients[0].chain.genesis().hash(); let mut last_epoch_id = EpochId::default(); @@ -246,10 +243,7 @@ fn test_epoch_sync_data_hash_from_epoch_sync_info() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let mut last_hash = *env.clients[0].chain.genesis().hash(); let mut last_epoch_id = EpochId::default(); @@ -331,7 +325,6 @@ fn test_node_after_simulated_sync() { .clients_count(num_clients) .real_stores() .use_state_snapshots() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/features/access_key_nonce_for_implicit_accounts.rs b/integration-tests/src/tests/client/features/access_key_nonce_for_implicit_accounts.rs index c5bdf5f3c7f..1c17f1f9fb7 100644 --- a/integration-tests/src/tests/client/features/access_key_nonce_for_implicit_accounts.rs +++ b/integration-tests/src/tests/client/features/access_key_nonce_for_implicit_accounts.rs @@ -52,10 +52,7 @@ fn test_transaction_hash_collision() { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer0 = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); @@ -125,10 +122,7 @@ fn get_status_of_tx_hash_collision_for_near_implicit_account( let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = protocol_version; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let deposit_for_account_creation = 10u128.pow(23); let mut height = 1; @@ -243,10 +237,7 @@ fn test_chunk_transaction_validity() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; genesis.config.min_gas_price = 0; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); let tx = SignedTransaction::send_money( @@ -277,10 +268,7 @@ fn test_transaction_nonce_too_large() { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); let large_nonce = AccessKey::ACCESS_KEY_NONCE_RANGE_MULTIPLIER + 1; @@ -345,7 +333,6 @@ fn test_request_chunks_for_orphan() { let mut env = TestEnv::builder(&genesis.config) .clients_count(num_clients) .validator_seats(num_validators as usize) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes_with_runtime_config_store( &genesis, @@ -485,7 +472,6 @@ fn test_processing_chunks_sanity() { let mut env = TestEnv::builder(&genesis.config) .clients_count(num_clients) .validator_seats(num_validators as usize) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes(&genesis) .build(); @@ -584,7 +570,6 @@ impl ChunkForwardingOptimizationTestData { let env = TestEnv::builder(&genesis.config) .clients_count(num_clients) .validator_seats(num_validators as usize) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes(&genesis) .build(); @@ -813,7 +798,6 @@ fn test_processing_blocks_async() { let mut env = TestEnv::builder(&genesis.config) .clients_count(num_clients) .validator_seats(num_validators as usize) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/features/account_id_in_function_call_permission.rs b/integration-tests/src/tests/client/features/account_id_in_function_call_permission.rs index fd24bb0352d..c41e27aa12b 100644 --- a/integration-tests/src/tests/client/features/account_id_in_function_call_permission.rs +++ b/integration-tests/src/tests/client/features/account_id_in_function_call_permission.rs @@ -30,7 +30,6 @@ fn test_account_id_in_function_call_permission_upgrade() { genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = old_protocol_version; TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store( &genesis, vec![RuntimeConfigStore::new(None)], @@ -93,7 +92,6 @@ fn test_very_long_account_id() { let mut env = { let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store( &genesis, vec![RuntimeConfigStore::new(None)], diff --git a/integration-tests/src/tests/client/features/adversarial_behaviors.rs b/integration-tests/src/tests/client/features/adversarial_behaviors.rs index bce7a6ccff5..7fc96e0659a 100644 --- a/integration-tests/src/tests/client/features/adversarial_behaviors.rs +++ b/integration-tests/src/tests/client/features/adversarial_behaviors.rs @@ -62,7 +62,6 @@ impl AdversarialBehaviorTestData { .clock(clock.clock()) .clients_count(num_clients) .validator_seats(num_validators as usize) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/features/chunk_nodes_cache.rs b/integration-tests/src/tests/client/features/chunk_nodes_cache.rs index b0092ecf5a0..77d19d467b5 100644 --- a/integration-tests/src/tests/client/features/chunk_nodes_cache.rs +++ b/integration-tests/src/tests/client/features/chunk_nodes_cache.rs @@ -91,7 +91,6 @@ fn compare_node_counts() { genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = old_protocol_version; let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store( &genesis, vec![RuntimeConfigStore::new(None)], diff --git a/integration-tests/src/tests/client/features/delegate_action.rs b/integration-tests/src/tests/client/features/delegate_action.rs index 6da1e8a7e91..567843e6122 100644 --- a/integration-tests/src/tests/client/features/delegate_action.rs +++ b/integration-tests/src/tests/client/features/delegate_action.rs @@ -57,10 +57,7 @@ fn exec_meta_transaction( Genesis::test(vec![validator, user.clone(), receiver.clone(), relayer.clone()], 1); genesis.config.epoch_length = 1000; genesis.config.protocol_version = protocol_version; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let tx = env.meta_tx_from_actions(actions, user, relayer, receiver); diff --git a/integration-tests/src/tests/client/features/fix_contract_loading_cost.rs b/integration-tests/src/tests/client/features/fix_contract_loading_cost.rs index 3302d39cd25..38abe02a965 100644 --- a/integration-tests/src/tests/client/features/fix_contract_loading_cost.rs +++ b/integration-tests/src/tests/client/features/fix_contract_loading_cost.rs @@ -19,7 +19,6 @@ fn prepare_env_with_contract( genesis.config.protocol_version = protocol_version; let runtime_config = near_parameters::RuntimeConfigStore::new(None); let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store(&genesis, vec![runtime_config]) .build(); deploy_test_contract(&mut env, account, &contract, epoch_length, 1); diff --git a/integration-tests/src/tests/client/features/fix_storage_usage.rs b/integration-tests/src/tests/client/features/fix_storage_usage.rs index 8cb2739e081..01351cc55b2 100644 --- a/integration-tests/src/tests/client/features/fix_storage_usage.rs +++ b/integration-tests/src/tests/client/features/fix_storage_usage.rs @@ -20,10 +20,7 @@ fn process_blocks_with_storage_usage_fix( genesis.config.chain_id = chain_id; genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = ProtocolFeature::FixStorageUsage.protocol_version() - 1; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); for i in 1..=16 { // We cannot just use TestEnv::produce_block as we are updating protocol version let mut block = env.clients[0].produce_block(i).unwrap().unwrap(); diff --git a/integration-tests/src/tests/client/features/flat_storage.rs b/integration-tests/src/tests/client/features/flat_storage.rs index 7b4fe15d5b1..9e8d5065525 100644 --- a/integration-tests/src/tests/client/features/flat_storage.rs +++ b/integration-tests/src/tests/client/features/flat_storage.rs @@ -29,7 +29,6 @@ fn test_flat_storage_upgrade() { genesis.config.protocol_version = old_protocol_version; let runtime_config = near_parameters::RuntimeConfigStore::new(None); let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store(&genesis, vec![runtime_config]) .build(); diff --git a/integration-tests/src/tests/client/features/in_memory_tries.rs b/integration-tests/src/tests/client/features/in_memory_tries.rs index d186d11f635..98fdee2205d 100644 --- a/integration-tests/src/tests/client/features/in_memory_tries.rs +++ b/integration-tests/src/tests/client/features/in_memory_tries.rs @@ -120,7 +120,6 @@ fn test_in_memory_trie_node_consistency() { let mut env = TestEnv::builder(&genesis.config) .clients(vec!["account0".parse().unwrap(), "account1".parse().unwrap()]) .stores(stores.clone()) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes_with_trie_config( &genesis, @@ -179,7 +178,6 @@ fn test_in_memory_trie_node_consistency() { let mut env = TestEnv::builder(&genesis.config) .clients(vec!["account0".parse().unwrap(), "account1".parse().unwrap()]) .stores(stores.clone()) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes_with_trie_config( &genesis, @@ -210,7 +208,6 @@ fn test_in_memory_trie_node_consistency() { let mut env = TestEnv::builder(&genesis.config) .clients(vec!["account0".parse().unwrap(), "account1".parse().unwrap()]) .stores(stores) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes_with_trie_config( &genesis, diff --git a/integration-tests/src/tests/client/features/increase_deployment_cost.rs b/integration-tests/src/tests/client/features/increase_deployment_cost.rs index 52b7d1b860d..e2bbe9a000e 100644 --- a/integration-tests/src/tests/client/features/increase_deployment_cost.rs +++ b/integration-tests/src/tests/client/features/increase_deployment_cost.rs @@ -35,7 +35,6 @@ fn test_deploy_cost_increased() { genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = old_protocol_version; TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store( &genesis, vec![RuntimeConfigStore::new(None)], diff --git a/integration-tests/src/tests/client/features/increase_storage_compute_cost.rs b/integration-tests/src/tests/client/features/increase_storage_compute_cost.rs index 8876bd7dab3..8cc10ffdfd8 100644 --- a/integration-tests/src/tests/client/features/increase_storage_compute_cost.rs +++ b/integration-tests/src/tests/client/features/increase_storage_compute_cost.rs @@ -195,7 +195,6 @@ fn assert_compute_limit_reached( genesis.config.protocol_version = old_protocol_version; genesis.config.gas_limit = genesis.config.gas_limit / gas_divider; TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store(&genesis, vec![runtime_config_store]) .build() }; diff --git a/integration-tests/src/tests/client/features/limit_contract_functions_number.rs b/integration-tests/src/tests/client/features/limit_contract_functions_number.rs index 8cfd7548aaa..8a04ee400a6 100644 --- a/integration-tests/src/tests/client/features/limit_contract_functions_number.rs +++ b/integration-tests/src/tests/client/features/limit_contract_functions_number.rs @@ -29,7 +29,6 @@ fn verify_contract_limits_upgrade( genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = old_protocol_version; let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store( &genesis, vec![RuntimeConfigStore::new(None)], diff --git a/integration-tests/src/tests/client/features/lower_storage_key_limit.rs b/integration-tests/src/tests/client/features/lower_storage_key_limit.rs index 6471d9d09f3..1eb4c54c5b9 100644 --- a/integration-tests/src/tests/client/features/lower_storage_key_limit.rs +++ b/integration-tests/src/tests/client/features/lower_storage_key_limit.rs @@ -44,7 +44,6 @@ fn protocol_upgrade() { genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = old_protocol_version; let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .track_all_shards() .nightshade_runtimes_with_runtime_config_store( &genesis, diff --git a/integration-tests/src/tests/client/features/nearvm.rs b/integration-tests/src/tests/client/features/nearvm.rs index be80de46bf5..44f88255ae8 100644 --- a/integration-tests/src/tests/client/features/nearvm.rs +++ b/integration-tests/src/tests/client/features/nearvm.rs @@ -28,7 +28,6 @@ fn test_nearvm_upgrade() { genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = old_protocol_version; let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store( &genesis, vec![RuntimeConfigStore::new(None)], diff --git a/integration-tests/src/tests/client/features/restore_receipts_after_fix_apply_chunks.rs b/integration-tests/src/tests/client/features/restore_receipts_after_fix_apply_chunks.rs index 74a4bc82ab9..44238eed0d2 100644 --- a/integration-tests/src/tests/client/features/restore_receipts_after_fix_apply_chunks.rs +++ b/integration-tests/src/tests/client/features/restore_receipts_after_fix_apply_chunks.rs @@ -32,10 +32,7 @@ fn run_test( // TODO #4305: get directly from NightshadeRuntime let migration_data = load_migration_data(&genesis.config.chain_id); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let get_restored_receipt_hashes = |migration_data: &MigrationData| -> HashSet { HashSet::from_iter( diff --git a/integration-tests/src/tests/client/features/restrict_tla.rs b/integration-tests/src/tests/client/features/restrict_tla.rs index 7dc7ef3fdbe..45c633107b5 100644 --- a/integration-tests/src/tests/client/features/restrict_tla.rs +++ b/integration-tests/src/tests/client/features/restrict_tla.rs @@ -17,7 +17,6 @@ fn test_create_top_level_accounts() { genesis.config.protocol_version = PROTOCOL_VERSION; let runtime_config = near_parameters::RuntimeConfigStore::new(None); let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store(&genesis, vec![runtime_config]) .build(); diff --git a/integration-tests/src/tests/client/features/stateless_validation.rs b/integration-tests/src/tests/client/features/stateless_validation.rs index a9b8a94ebba..589d2f0d72a 100644 --- a/integration-tests/src/tests/client/features/stateless_validation.rs +++ b/integration-tests/src/tests/client/features/stateless_validation.rs @@ -121,7 +121,7 @@ fn run_chunk_validation_test(seed: u64, prob_missing_chunk: f64) { let genesis = Genesis::new(genesis_config, GenesisRecords(records)).unwrap(); let mut env = TestEnv::builder(&genesis.config) .clients(accounts.iter().take(8).cloned().collect()) - .real_epoch_managers_with_test_overrides(epoch_config_test_overrides) + .epoch_managers_with_test_overrides(epoch_config_test_overrides) .nightshade_runtimes(&genesis) .build(); let mut tx_hashes = vec![]; diff --git a/integration-tests/src/tests/client/features/wallet_contract.rs b/integration-tests/src/tests/client/features/wallet_contract.rs index 669bb9a06b1..dc9ac33b1bf 100644 --- a/integration-tests/src/tests/client/features/wallet_contract.rs +++ b/integration-tests/src/tests/client/features/wallet_contract.rs @@ -72,10 +72,7 @@ fn test_eth_implicit_account_creation() { return; } let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); @@ -128,10 +125,7 @@ fn test_transaction_from_eth_implicit_account_fail() { return; } let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let deposit_for_account_creation = NEAR_BASE; let mut height = 1; diff --git a/integration-tests/src/tests/client/features/zero_balance_account.rs b/integration-tests/src/tests/client/features/zero_balance_account.rs index 736c5f72405..6c284c7a613 100644 --- a/integration-tests/src/tests/client/features/zero_balance_account.rs +++ b/integration-tests/src/tests/client/features/zero_balance_account.rs @@ -51,10 +51,7 @@ fn test_zero_balance_account_creation() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = ProtocolFeature::ZeroBalanceAccount.protocol_version(); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let new_account_id: AccountId = "hello.test0".parse().unwrap(); @@ -133,7 +130,6 @@ fn test_zero_balance_account_add_key() { runtime_config.wasm_config.ext_costs = ExtCostsConfig::test(); let runtime_config_store = RuntimeConfigStore::with_one_config(runtime_config); let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes_with_runtime_config_store(&genesis, vec![runtime_config_store]) .build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); @@ -251,10 +247,7 @@ fn test_zero_balance_account_upgrade() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; genesis.config.protocol_version = ProtocolFeature::ZeroBalanceAccount.protocol_version() - 1; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let new_account_id: AccountId = "hello.test0".parse().unwrap(); diff --git a/integration-tests/src/tests/client/flat_storage.rs b/integration-tests/src/tests/client/flat_storage.rs index 3aaf08dfcc1..d865a26af7c 100644 --- a/integration-tests/src/tests/client/flat_storage.rs +++ b/integration-tests/src/tests/client/flat_storage.rs @@ -33,11 +33,7 @@ const CREATION_TIMEOUT: BlockHeight = 30; /// Setup environment with one Near client for testing. fn setup_env(genesis: &Genesis, store: Store) -> TestEnv { - TestEnv::builder(&genesis.config) - .stores(vec![store]) - .real_epoch_managers() - .nightshade_runtimes(genesis) - .build() + TestEnv::builder(&genesis.config).stores(vec![store]).nightshade_runtimes(genesis).build() } /// Waits for flat storage creation on given shard for `CREATION_TIMEOUT` blocks. diff --git a/integration-tests/src/tests/client/process_blocks.rs b/integration-tests/src/tests/client/process_blocks.rs index 9ec134f648d..6e6b1f3f238 100644 --- a/integration-tests/src/tests/client/process_blocks.rs +++ b/integration-tests/src/tests/client/process_blocks.rs @@ -200,10 +200,7 @@ pub(crate) fn prepare_env_with_congestion( if let Some(gas_price_adjustment_rate) = gas_price_adjustment_rate { genesis.config.gas_price_adjustment_rate = gas_price_adjustment_rate; } - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); @@ -1014,10 +1011,7 @@ fn test_process_invalid_tx() { init_test_logger(); let mut genesis = Genesis::test(vec!["test0".parse().unwrap()], 1); genesis.config.transaction_validity_period = 10; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let signer = InMemorySigner::from_seed("test1".parse().unwrap(), KeyType::ED25519, "test0"); let tx = SignedTransaction::new( Signature::empty(KeyType::ED25519), @@ -1058,7 +1052,7 @@ fn test_process_invalid_tx() { #[test] fn test_time_attack() { init_test_logger(); - let mut env = TestEnv::default_builder().clients_count(1).build(); + let mut env = TestEnv::default_builder().clients_count(1).mock_epoch_managers().build(); let client = &mut env.clients[0]; let signer = client.validator_signer.as_ref().unwrap(); let genesis = client.chain.get_block_by_height(0).unwrap(); @@ -1075,7 +1069,7 @@ fn test_time_attack() { #[test] fn test_no_double_sign() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let _ = env.clients[0].produce_block(1).unwrap().unwrap(); // Second time producing with the same height should fail. assert_eq!(env.clients[0].produce_block(1).unwrap(), None); @@ -1086,7 +1080,7 @@ fn test_invalid_gas_price() { init_test_logger(); let mut genesis_config = GenesisConfig::test(); genesis_config.min_gas_price = 100; - let mut env = TestEnv::builder(&genesis_config).clients_count(1).build(); + let mut env = TestEnv::builder(&genesis_config).clients_count(1).mock_epoch_managers().build(); let client = &mut env.clients[0]; let signer = client.validator_signer.as_ref().unwrap(); @@ -1101,7 +1095,7 @@ fn test_invalid_gas_price() { #[test] fn test_invalid_height_too_large() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let b1 = env.clients[0].produce_block(1).unwrap().unwrap(); let _ = env.clients[0].process_block_test(b1.clone().into(), Provenance::PRODUCED).unwrap(); let signer = Arc::new(create_test_signer("test0")); @@ -1113,7 +1107,7 @@ fn test_invalid_height_too_large() { /// Check that if block height is 5 epochs behind the head, it is not processed. #[test] fn test_invalid_height_too_old() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); for i in 1..4 { env.produce_block(0, i); } @@ -1127,7 +1121,7 @@ fn test_invalid_height_too_old() { #[test] fn test_bad_orphan() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); for i in 1..4 { env.produce_block(0, i); } @@ -1221,7 +1215,6 @@ fn test_bad_chunk_mask() { let genesis = Genesis::test_sharded(accounts.clone(), num_validators, vec![num_validators; 2]); let mut env = TestEnv::builder(&genesis.config) .clients(accounts) - .real_epoch_managers() .nightshade_runtimes(&genesis) .track_all_shards() .build(); @@ -1293,7 +1286,7 @@ fn test_minimum_gas_price() { let mut genesis_config = GenesisConfig::test(); genesis_config.min_gas_price = min_gas_price; genesis_config.gas_price_adjustment_rate = Ratio::new(1, 10); - let mut env = TestEnv::builder(&genesis_config).build(); + let mut env = TestEnv::builder(&genesis_config).mock_epoch_managers().build(); for i in 1..=100 { env.produce_block(0, i); } @@ -1304,10 +1297,7 @@ fn test_minimum_gas_price() { fn test_gc_with_epoch_length_common(epoch_length: NumBlocks) { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let mut blocks = vec![]; let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); blocks.push(genesis_block); @@ -1371,7 +1361,6 @@ fn test_archival_save_trie_changes() { genesis.config.epoch_length = epoch_length; genesis.config.total_supply = 1_000_000_000; let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes(&genesis) .archive(true) .save_trie_changes(true) @@ -1442,7 +1431,6 @@ fn test_archival_gc_common( let hot_store = &storage.get_hot_store(); let mut env = TestEnv::builder(&genesis.config) .stores(vec![hot_store.clone()]) - .real_epoch_managers() .nightshade_runtimes(&genesis) .archive(true) .save_trie_changes(true) @@ -1550,20 +1538,20 @@ fn test_archival_gc_split_storage_behind() { fn test_gc_block_skips() { let mut genesis_config = GenesisConfig::test(); genesis_config.epoch_length = 5; - let mut env = TestEnv::builder(&genesis_config).build(); + let mut env = TestEnv::builder(&genesis_config).mock_epoch_managers().build(); for i in 1..=1000 { if i % 2 == 0 { env.produce_block(0, i); } } - let mut env = TestEnv::builder(&genesis_config).build(); + let mut env = TestEnv::builder(&genesis_config).mock_epoch_managers().build(); for i in 1..=1000 { if i % 2 == 1 { env.produce_block(0, i); } } // Epoch skips - let mut env = TestEnv::builder(&genesis_config).build(); + let mut env = TestEnv::builder(&genesis_config).mock_epoch_managers().build(); for i in 1..=1000 { if i % 9 == 7 { env.produce_block(0, i); @@ -1576,7 +1564,7 @@ fn test_gc_chunk_tail() { let mut genesis_config = GenesisConfig::test(); let epoch_length = 100; genesis_config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis_config).build(); + let mut env = TestEnv::builder(&genesis_config).mock_epoch_managers().build(); let mut chunk_tail = 0; for i in (1..10).chain(101..epoch_length * 6) { env.produce_block(0, i); @@ -1591,10 +1579,7 @@ fn test_gc_execution_outcome() { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_hash = *env.clients[0].chain.genesis().hash(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); let tx = SignedTransaction::send_money( @@ -1625,11 +1610,8 @@ fn test_gc_after_state_sync() { let epoch_length = 1024; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .clients_count(2) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = + TestEnv::builder(&genesis.config).clients_count(2).nightshade_runtimes(&genesis).build(); for i in 1..epoch_length * 4 + 2 { let block = env.clients[0].produce_block(i).unwrap().unwrap(); env.process_block(0, block.clone(), Provenance::PRODUCED); @@ -1668,7 +1650,6 @@ fn test_process_block_after_state_sync() { .clients_count(1) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); @@ -1708,11 +1689,8 @@ fn test_gc_fork_tail() { let epoch_length = 101; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .clients_count(2) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = + TestEnv::builder(&genesis.config).clients_count(2).nightshade_runtimes(&genesis).build(); let b1 = env.clients[0].produce_block(1).unwrap().unwrap(); for i in 0..2 { env.process_block(i, b1.clone(), Provenance::NONE); @@ -1746,7 +1724,11 @@ fn test_gc_fork_tail() { fn test_tx_forwarding() { let mut genesis_config = GenesisConfig::test(); genesis_config.epoch_length = 100; - let mut env = TestEnv::builder(&genesis_config).clients_count(50).validator_seats(50).build(); + let mut env = TestEnv::builder(&genesis_config) + .clients_count(50) + .validator_seats(50) + .mock_epoch_managers() + .build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let genesis_hash = *genesis_block.hash(); // forward to 2 chunk producers @@ -1761,7 +1743,11 @@ fn test_tx_forwarding() { fn test_tx_forwarding_no_double_forwarding() { let mut genesis_config = GenesisConfig::test(); genesis_config.epoch_length = 100; - let mut env = TestEnv::builder(&genesis_config).clients_count(50).validator_seats(50).build(); + let mut env = TestEnv::builder(&genesis_config) + .clients_count(50) + .validator_seats(50) + .mock_epoch_managers() + .build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let genesis_hash = *genesis_block.hash(); // The transaction has already been forwarded, so it won't be forwarded again. @@ -1782,7 +1768,6 @@ fn test_tx_forward_around_epoch_boundary() { let mut env = TestEnv::builder(&genesis.config) .clients_count(3) .validator_seats(2) - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); let genesis_hash = *env.clients[0].chain.genesis().hash(); @@ -1837,10 +1822,7 @@ fn test_not_resync_old_blocks() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); let epoch_length = 5; genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let mut blocks = vec![]; for i in 1..=epoch_length * (DEFAULT_GC_NUM_EPOCHS_TO_KEEP + 1) { let block = env.clients[0].produce_block(i).unwrap().unwrap(); @@ -1861,11 +1843,8 @@ fn test_gc_tail_update() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); let epoch_length = 2; genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .clients_count(2) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = + TestEnv::builder(&genesis.config).clients_count(2).nightshade_runtimes(&genesis).build(); let mut blocks = vec![]; for i in 1..=epoch_length * (DEFAULT_GC_NUM_EPOCHS_TO_KEEP + 1) { let block = env.clients[0].produce_block(i).unwrap().unwrap(); @@ -1917,10 +1896,7 @@ fn test_gas_price_change() { genesis.config.min_gas_price = min_gas_price; genesis.config.gas_limit = gas_limit; genesis.config.gas_price_adjustment_rate = gas_price_adjustment_rate; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let genesis_hash = *genesis_block.hash(); @@ -1965,10 +1941,7 @@ fn test_gas_price_overflow() { genesis.config.epoch_length = 43200; genesis.config.max_gas_price = max_gas_price; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let genesis_hash = *genesis_block.hash(); let signer = InMemorySigner::from_seed("test1".parse().unwrap(), KeyType::ED25519, "test1"); @@ -1990,7 +1963,7 @@ fn test_gas_price_overflow() { #[test] fn test_invalid_block_root() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let mut b1 = env.clients[0].produce_block(1).unwrap().unwrap(); let signer = create_test_signer("test0"); b1.mut_header().get_mut().inner_lite.block_merkle_root = CryptoHash::default(); @@ -2004,7 +1977,6 @@ fn test_incorrect_validator_key_produce_block() { let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 2); let mut env = TestEnv::builder(&genesis.config) .clients_count(1) - .real_epoch_managers() .nightshade_runtimes(&genesis) .track_all_shards() .build(); @@ -2014,7 +1986,7 @@ fn test_incorrect_validator_key_produce_block() { } fn test_block_merkle_proof_with_len(n: NumBlocks, rng: &mut StdRng) { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let mut blocks = vec![genesis_block.clone()]; let mut cur_height = genesis_block.header().height() + 1; @@ -2081,7 +2053,7 @@ fn test_block_merkle_proof() { #[test] fn test_block_merkle_proof_same_hash() { - let env = TestEnv::default_builder().build(); + let env = TestEnv::default_builder().mock_epoch_managers().build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let proof = env.clients[0].chain.get_block_proof(genesis_block.hash(), genesis_block.hash()).unwrap(); @@ -2093,10 +2065,7 @@ fn test_data_reset_before_state_sync() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap()], 1); let epoch_length = 5; genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let genesis_hash = *genesis_block.hash(); @@ -2151,10 +2120,7 @@ fn test_sync_hash_validity() { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); for i in 1..19 { env.produce_block(0, i); } @@ -2178,7 +2144,7 @@ fn test_sync_hash_validity() { #[test] fn test_block_height_processed_orphan() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let block = env.clients[0].produce_block(1).unwrap().unwrap(); let mut orphan_block = block; let validator_signer = create_test_signer("test0"); @@ -2203,10 +2169,7 @@ fn test_validate_chunk_extra() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; genesis.config.min_gas_price = 0; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let genesis_height = genesis_block.header().height(); @@ -2364,7 +2327,6 @@ fn test_catchup_gas_price_change() { .clients_count(2) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); @@ -2466,10 +2428,7 @@ fn test_block_execution_outcomes() { genesis.config.epoch_length = epoch_length; genesis.config.min_gas_price = min_gas_price; genesis.config.gas_limit = 1000000000000; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); let mut tx_hashes = vec![]; @@ -2557,10 +2516,7 @@ fn test_refund_receipts_processing() { // Set gas limit to be small enough to produce some delayed receipts, but large enough for // transactions to get through. genesis.config.gas_limit = 100_000_000; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); let mut tx_hashes = vec![]; @@ -2634,10 +2590,7 @@ fn test_delayed_receipt_count_limit() { let transaction_costs = RuntimeConfig::test().fees; let chunk_gas_limit = 10 * transaction_costs.fee(ActionCosts::new_action_receipt).exec_fee(); genesis.config.gas_limit = chunk_gas_limit; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); @@ -2696,10 +2649,7 @@ fn test_execution_metadata() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); deploy_test_contract(&mut env, "test0".parse().unwrap(), &wasm_code, epoch_length, 1); env @@ -2777,7 +2727,6 @@ fn test_epoch_protocol_version_change() { let mut env = TestEnv::builder(&genesis.config) .clients_count(2) .validator_seats(2) - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); for i in 1..=16 { @@ -2835,10 +2784,7 @@ fn test_epoch_protocol_version_change() { #[test] fn test_discard_non_finalizable_block() { let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let first_block = env.clients[0].produce_block(1).unwrap().unwrap(); env.process_block(0, first_block.clone(), Provenance::PRODUCED); @@ -2896,10 +2842,7 @@ fn test_query_final_state() { let epoch_length = 10; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); @@ -3097,10 +3040,7 @@ fn prepare_env_with_transaction() -> (TestEnv, CryptoHash) { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); @@ -3125,7 +3065,6 @@ fn test_not_broadcast_block_on_accept() { let network_adapter = Arc::new(MockPeerManagerAdapter::default()); let mut env = TestEnv::builder(&genesis.config) .clients_count(2) - .real_epoch_managers() .nightshade_runtimes(&genesis) .network_adapters(vec![ Arc::new(MockPeerManagerAdapter::default()), @@ -3145,10 +3084,7 @@ fn test_header_version_downgrade() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = 5; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let validator_signer = create_test_signer("test0"); for i in 1..10 { let block = env.clients[0].produce_block(i).unwrap().unwrap(); @@ -3193,10 +3129,7 @@ fn test_node_shutdown_with_old_protocol_version() { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let validator_signer = create_test_signer("test0"); for i in 1..=5 { let mut block = env.clients[0].produce_block(i).unwrap().unwrap(); @@ -3212,7 +3145,7 @@ fn test_node_shutdown_with_old_protocol_version() { #[test] fn test_block_ordinal() { - let mut env = TestEnv::default_builder().build(); + let mut env = TestEnv::default_builder().mock_epoch_managers().build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); assert_eq!(genesis_block.header().block_ordinal(), 1); let mut ordinal = 1; @@ -3326,10 +3259,7 @@ fn test_validator_stake_host_function() { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let genesis_block = env.clients[0].chain.get_block_by_height(0).unwrap(); let block_height = deploy_test_contract( &mut env, @@ -3371,7 +3301,6 @@ fn test_catchup_no_sharding_change() { let mut env = TestEnv::builder(&genesis.config) .clients_count(1) .validator_seats(1) - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); // run the chain to a few epochs and make sure no catch up is triggered and the chain still @@ -3405,11 +3334,8 @@ fn test_long_chain_with_restart_from_snapshot() { let mut genesis = Genesis::test(vec!["test0".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env1 = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .archive(false) - .build(); + let mut env1 = + TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).archive(false).build(); // In TestEnv `gc_blocks_limit` defaults to 100. // That means that whole epoch will be garbage collected in one block. @@ -3427,7 +3353,6 @@ fn test_long_chain_with_restart_from_snapshot() { let mut env2 = TestEnv::builder(&genesis.config) .stores(vec![env1.clients[0].chain.chain_store().store().clone()]) - .real_epoch_managers() .nightshade_runtimes(&genesis) .archive(false) .build(); @@ -3484,7 +3409,6 @@ mod contract_precompilation_tests { .clients_count(num_clients) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); @@ -3580,7 +3504,6 @@ mod contract_precompilation_tests { .clients_count(num_clients) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); @@ -3658,7 +3581,6 @@ mod contract_precompilation_tests { .clients_count(num_clients) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/resharding.rs b/integration-tests/src/tests/client/resharding.rs index 380530ee5f5..c88d46936bb 100644 --- a/integration-tests/src/tests/client/resharding.rs +++ b/integration-tests/src/tests/client/resharding.rs @@ -219,7 +219,7 @@ impl TestReshardingEnv { .clients_count(num_clients) .validator_seats(num_validators) .real_stores() - .real_epoch_managers_with_test_overrides(epoch_config_test_overrides) + .epoch_managers_with_test_overrides(epoch_config_test_overrides) .nightshade_runtimes(&genesis) .track_all_shards() .build(); diff --git a/integration-tests/src/tests/client/runtimes.rs b/integration-tests/src/tests/client/runtimes.rs index 32a6bded5de..af415351ed1 100644 --- a/integration-tests/src/tests/client/runtimes.rs +++ b/integration-tests/src/tests/client/runtimes.rs @@ -19,10 +19,7 @@ use std::sync::Arc; #[test] fn test_pending_approvals() { let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let signer = create_test_signer("test0"); let parent_hash = hash(&[1]); let approval = Approval::new(parent_hash, 0, 1, &signer); @@ -41,7 +38,6 @@ fn test_invalid_approvals() { let genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); let network_adapter = Arc::new(MockPeerManagerAdapter::default()); let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() .nightshade_runtimes(&genesis) .network_adapters(vec![network_adapter]) .build(); @@ -71,10 +67,7 @@ fn test_cap_max_gas_price() { genesis.config.max_gas_price = 1_000_000; genesis.config.protocol_version = ProtocolFeature::CapMaxGasPrice.protocol_version(); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); for i in 1..epoch_length { let block = env.clients[0].produce_block(i).unwrap().unwrap(); diff --git a/integration-tests/src/tests/client/sandbox.rs b/integration-tests/src/tests/client/sandbox.rs index 1945d31bf62..c40eb225340 100644 --- a/integration-tests/src/tests/client/sandbox.rs +++ b/integration-tests/src/tests/client/sandbox.rs @@ -17,10 +17,7 @@ fn test_setup() -> (TestEnv, InMemorySigner) { let epoch_length = 5; let mut genesis = Genesis::test(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1); genesis.config.epoch_length = epoch_length; - let mut env = TestEnv::builder(&genesis.config) - .real_epoch_managers() - .nightshade_runtimes(&genesis) - .build(); + let mut env = TestEnv::builder(&genesis.config).nightshade_runtimes(&genesis).build(); let signer = InMemorySigner::from_seed("test0".parse().unwrap(), KeyType::ED25519, "test0"); assert_eq!( send_tx( diff --git a/integration-tests/src/tests/client/state_dump.rs b/integration-tests/src/tests/client/state_dump.rs index 5ff257c53ef..6b7d96f66f1 100644 --- a/integration-tests/src/tests/client/state_dump.rs +++ b/integration-tests/src/tests/client/state_dump.rs @@ -43,7 +43,6 @@ fn test_state_dump() { .clients_count(1) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); @@ -141,7 +140,6 @@ fn run_state_sync_with_dumped_parts( .clients_count(num_clients) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/state_snapshot.rs b/integration-tests/src/tests/client/state_snapshot.rs index c5416fd1d49..7b3da362ef4 100644 --- a/integration-tests/src/tests/client/state_snapshot.rs +++ b/integration-tests/src/tests/client/state_snapshot.rs @@ -198,7 +198,6 @@ fn test_make_state_snapshot() { .clients_count(1) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/sync_state_nodes.rs b/integration-tests/src/tests/client/sync_state_nodes.rs index 77421228c99..773e0a28c7d 100644 --- a/integration-tests/src/tests/client/sync_state_nodes.rs +++ b/integration-tests/src/tests/client/sync_state_nodes.rs @@ -568,7 +568,6 @@ fn test_dump_epoch_missing_chunk_in_last_block() { .clients_count(2) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build(); diff --git a/integration-tests/src/tests/client/undo_block.rs b/integration-tests/src/tests/client/undo_block.rs index 1d3d1caf4ec..920ac244fe1 100644 --- a/integration-tests/src/tests/client/undo_block.rs +++ b/integration-tests/src/tests/client/undo_block.rs @@ -12,11 +12,8 @@ use std::sync::Arc; /// Setup environment with one Near client for testing. fn setup_env(genesis: &Genesis, store: Store) -> (TestEnv, Arc) { - let env = TestEnv::builder(&genesis.config) - .stores(vec![store]) - .real_epoch_managers() - .nightshade_runtimes(genesis) - .build(); + let env = + TestEnv::builder(&genesis.config).stores(vec![store]).nightshade_runtimes(genesis).build(); let epoch_manager = env.clients[0].epoch_manager.clone(); (env, epoch_manager) } diff --git a/tools/state-viewer/src/state_dump.rs b/tools/state-viewer/src/state_dump.rs index 96100a9be3f..dcdd775522f 100644 --- a/tools/state-viewer/src/state_dump.rs +++ b/tools/state-viewer/src/state_dump.rs @@ -339,13 +339,11 @@ mod test { .validator_seats(2) .use_state_snapshots() .real_stores() - .real_epoch_managers() .nightshade_runtimes(&genesis) .build() } else { TestEnv::builder(&genesis.config) .validator_seats(2) - .real_epoch_managers() .nightshade_runtimes(&genesis) .build() };