refactor: improve compilation time for neard tests

See #4027 for discussion why this layout is better. TL;DR is that we
don't re-link neard repeatedly.

As a cherry on top, we now get to proprely share NodeCluster code
between the tests, instead of it being compiled afresh for each test.

neard/src/lib.rs

@@ -40,6 +40,9 @@ mod migrations;
 mod runtime;
 mod shard_tracker;
 
+#[cfg(test)]
+mod tests;
+
 const STORE_PATH: &str = "data";
 
 pub fn store_path_exists<P: AsRef<Path>>(path: P) -> bool {

neard/tests/node_cluster.rs → neard/src/tests.rs

@@ -1,3 +1,12 @@
+mod economics;
+mod load_genesis;
+mod rpc_nodes;
+mod run_nodes;
+mod stake_nodes;
+mod sync_nodes;
+mod sync_state_nodes;
+mod track_shards;
+
 use futures::future;
 
 use near_actix_test_utils::{run_actix_until_stop, spawn_interruptible};

neard/tests/economics.rs → neard/src/tests/economics.rs

@@ -4,14 +4,14 @@ use std::sync::Arc;
 
 use num_rational::Rational;
 
+use crate::config::GenesisExt;
 use near_chain::{ChainGenesis, RuntimeAdapter};
 use near_chain_configs::Genesis;
 use near_client::test_utils::TestEnv;
 use near_crypto::{InMemorySigner, KeyType};
 use near_logger_utils::init_integration_logger;
 use near_primitives::transaction::SignedTransaction;
 use near_store::test_utils::create_test_store;
-use neard::config::GenesisExt;
 use testlib::fees_utils::FeeHelper;
 
 #[cfg(feature = "protocol_feature_rectify_inflation")]
@@ -26,7 +26,7 @@ fn setup_env(f: &mut dyn FnMut(&mut Genesis) -> ()) -> (TestEnv, FeeHelper) {
         genesis.config.runtime_config.transaction_costs.clone(),
         genesis.config.min_gas_price,
     );
-    let runtimes: Vec<Arc<dyn RuntimeAdapter>> = vec![Arc::new(neard::NightshadeRuntime::new(
+    let runtimes: Vec<Arc<dyn RuntimeAdapter>> = vec![Arc::new(crate::NightshadeRuntime::new(
         Path::new("."),
         store1,
         &genesis,

neard/tests/rpc_nodes.rs → neard/src/tests/rpc_nodes.rs

@@ -23,11 +23,10 @@ use near_primitives::types::{BlockId, BlockReference, Finality, TransactionOrRec
 use near_primitives::views::{
     ExecutionOutcomeView, ExecutionStatusView, FinalExecutionOutcomeViewEnum, FinalExecutionStatus,
 };
-use neard::config::TESTING_INIT_BALANCE;
 use testlib::genesis_block;
 
-mod node_cluster;
-use node_cluster::NodeCluster;
+use crate::config::TESTING_INIT_BALANCE;
+use crate::tests::NodeCluster;
 
 macro_rules! panic_on_rpc_error {
     ($e:expr) => {

neard/tests/run_nodes.rs → neard/src/tests/run_nodes.rs

@@ -7,8 +7,7 @@ use near_network::test_utils::WaitOrTimeout;
 use near_primitives::types::{BlockHeightDelta, NumSeats, NumShards};
 use rand::{thread_rng, Rng};
 
-mod node_cluster;
-use node_cluster::NodeCluster;
+use crate::tests::NodeCluster;
 
 fn run_heavy_nodes(
     num_shards: NumShards,

neard/tests/stake_nodes.rs → neard/src/tests/stake_nodes.rs

@@ -19,13 +19,14 @@ use near_primitives::hash::CryptoHash;
 use near_primitives::transaction::SignedTransaction;
 use near_primitives::types::{AccountId, BlockHeightDelta, BlockReference, NumSeats};
 use near_primitives::views::{QueryRequest, QueryResponseKind, ValidatorInfo};
-use neard::config::{GenesisExt, TESTING_INIT_BALANCE, TESTING_INIT_STAKE};
-use neard::{load_test_config, start_with_config, NearConfig, NEAR_BASE};
 use testlib::{genesis_hash, test_helpers::heavy_test};
 
 #[cfg(feature = "protocol_feature_rectify_inflation")]
 use {near_primitives::types::BlockId, primitive_types::U256};
 
+use crate::config::{GenesisExt, TESTING_INIT_BALANCE, TESTING_INIT_STAKE};
+use crate::{load_test_config, start_with_config, NearConfig, NEAR_BASE};
+
 #[derive(Clone)]
 struct TestNode {
     account_id: AccountId,

neard/tests/sync_nodes.rs → neard/src/tests/sync_nodes.rs

@@ -21,10 +21,11 @@ use near_primitives::types::validator_stake::ValidatorStake;
 use near_primitives::types::{BlockHeightDelta, EpochId};
 use near_primitives::validator_signer::{InMemoryValidatorSigner, ValidatorSigner};
 use near_primitives::version::PROTOCOL_VERSION;
-use neard::config::{GenesisExt, TESTING_INIT_STAKE};
-use neard::{load_test_config, start_with_config, NearConfig};
 use testlib::{genesis_block, test_helpers::heavy_test};
 
+use crate::config::{GenesisExt, TESTING_INIT_STAKE};
+use crate::{load_test_config, start_with_config, NearConfig};
+
 // This assumes that there is no height skipped. Otherwise epoch hash calculation will be wrong.
 fn add_blocks(
     mut blocks: Vec<Block>,

neard/tests/sync_state_nodes.rs → neard/src/tests/sync_state_nodes.rs

@@ -9,9 +9,10 @@ use near_chain_configs::Genesis;
 use near_client::GetBlock;
 use near_logger_utils::init_integration_logger;
 use near_network::test_utils::{convert_boot_nodes, open_port, WaitOrTimeout};
-use neard::{config::GenesisExt, load_test_config, start_with_config};
 use testlib::test_helpers::heavy_test;
 
+use crate::{config::GenesisExt, load_test_config, start_with_config};
+
 /// One client is in front, another must sync to it using state (fast) sync.
 #[test]
 fn sync_state_nodes() {

neard/tests/track_shards.rs → neard/src/tests/track_shards.rs

@@ -9,8 +9,7 @@ use near_logger_utils::init_integration_logger;
 use near_network::test_utils::WaitOrTimeout;
 use near_primitives::hash::CryptoHash;
 
-mod node_cluster;
-use node_cluster::NodeCluster;
+use crate::tests::NodeCluster;
 
 #[test]
 fn track_shards() {