Move test-validator to own module to reduce core dependencies (solana…

…-labs#20658) * Move test-validator to own module to reduce core dependencies * Fix a few TestValidator paths * Use solana_test_validator crate for solana_test_validator bin * Move client int tests to separate crate Co-authored-by: Tyera Eulberg <tyera@solana.com>
CASABECI · Oct 29, 2021 · a8d78e8 · a8d78e8
1 parent e16c060
commit a8d78e8
Show file tree

Hide file tree

Showing 26 changed files with 193 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,6 +73,9 @@ members = [
     "watchtower",
     "replica-node",
     "replica-lib",
+    "test-validator",
+    "rpc-test",
+    "client-test",
 ]
 
 exclude = [

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -46,8 +46,8 @@ thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "=1.9.0" }
 solana-streamer = { path = "../streamer", version = "=1.9.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.0" }
 tempfile = "3.2.0"
 
 [[bin]]

diff --git a/cli/tests/nonce.rs b/cli/tests/nonce.rs
@@ -9,7 +9,6 @@ use solana_client::{
     nonce_utils,
     rpc_client::RpcClient,
 };
-use solana_core::test_validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     commitment_config::CommitmentConfig,
@@ -19,6 +18,7 @@ use solana_sdk::{
     system_program,
 };
 use solana_streamer::socket::SocketAddrSpace;
+use solana_test_validator::TestValidator;
 
 #[test]
 fn test_nonce() {

diff --git a/cli/tests/program.rs b/cli/tests/program.rs
@@ -5,7 +5,6 @@ use solana_cli::{
 };
 use solana_cli_output::OutputFormat;
 use solana_client::rpc_client::RpcClient;
-use solana_core::test_validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
@@ -16,6 +15,7 @@ use solana_sdk::{
     signature::{Keypair, Signer},
 };
 use solana_streamer::socket::SocketAddrSpace;
+use solana_test_validator::TestValidator;
 use std::{env, fs::File, io::Read, path::PathBuf, str::FromStr};
 
 #[test]

diff --git a/cli/tests/request_airdrop.rs b/cli/tests/request_airdrop.rs
@@ -1,12 +1,12 @@
 use solana_cli::cli::{process_command, CliCommand, CliConfig};
 use solana_client::rpc_client::RpcClient;
-use solana_core::test_validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     commitment_config::CommitmentConfig,
     signature::{Keypair, Signer},
 };
 use solana_streamer::socket::SocketAddrSpace;
+use solana_test_validator::TestValidator;
 
 #[test]
 fn test_cli_request_airdrop() {

diff --git a/cli/tests/stake.rs b/cli/tests/stake.rs
@@ -11,7 +11,6 @@ use solana_client::{
     nonce_utils,
     rpc_client::RpcClient,
 };
-use solana_core::test_validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
@@ -26,6 +25,7 @@ use solana_sdk::{
     },
 };
 use solana_streamer::socket::SocketAddrSpace;
+use solana_test_validator::TestValidator;
 
 #[test]
 fn test_stake_delegation_force() {

diff --git a/cli/tests/transfer.rs b/cli/tests/transfer.rs
@@ -10,7 +10,6 @@ use solana_client::{
     nonce_utils,
     rpc_client::RpcClient,
 };
-use solana_core::test_validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     commitment_config::CommitmentConfig,
@@ -20,6 +19,7 @@ use solana_sdk::{
     stake,
 };
 use solana_streamer::socket::SocketAddrSpace;
+use solana_test_validator::TestValidator;
 
 #[test]
 fn test_transfer() {

diff --git a/cli/tests/vote.rs b/cli/tests/vote.rs
@@ -7,14 +7,14 @@ use solana_client::{
     blockhash_query::{self, BlockhashQuery},
     rpc_client::RpcClient,
 };
-use solana_core::test_validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
     account_utils::StateMut,
     commitment_config::CommitmentConfig,
     signature::{Keypair, Signer},
 };
 use solana_streamer::socket::SocketAddrSpace;
+use solana_test_validator::TestValidator;
 use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
 
 #[test]

diff --git a/client-test/Cargo.toml b/client-test/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "solana-client-test"
+version = "1.9.0"
+description = "Solana RPC Test"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+documentation = "https://docs.rs/solana-client-test"
+edition = "2018"
+
+[dependencies]
+solana-client = { path = "../client", version = "=1.9.0" }
+solana-measure = { path = "../measure", version = "=1.9.0" }
+solana-merkle-tree = { path = "../merkle-tree", version = "=1.9.0" }
+solana-metrics = { path = "../metrics", version = "=1.9.0" }
+solana-perf = { path = "../perf", version = "=1.9.0" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.0" }
+solana-rpc = { path = "../rpc", version = "=1.9.0" }
+solana-runtime = { path = "../runtime", version = "=1.9.0" }
+solana-sdk = { path = "../sdk", version = "=1.9.0" }
+solana-streamer = { path = "../streamer", version = "=1.9.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.0" }
+solana-version = { path = "../version", version = "=1.9.0" }
+systemstat = "0.1.10"
+
+[dev-dependencies]
+solana-logger = { path = "../logger", version = "=1.9.0" }
+
+[lib]
+crate-type = ["lib"]
+name = "solana_entry"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/client-test/src/lib.rs b/client-test/src/lib.rs
@@ -0,0 +1 @@
+// This is a test-only crate
diff --git a/core/tests/client.rs → client-test/tests/client.rs b/core/tests/client.rs → client-test/tests/client.rs
@@ -1,5 +1,4 @@
 use solana_client::{pubsub_client::PubsubClient, rpc_client::RpcClient, rpc_response::SlotInfo};
-use solana_core::test_validator::TestValidator;
 use solana_rpc::{
     optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
     rpc_pubsub_service::{PubSubConfig, PubSubService},
@@ -19,6 +18,7 @@ use solana_sdk::{
     system_transaction,
 };
 use solana_streamer::socket::SocketAddrSpace;
+use solana_test_validator::TestValidator;
 use std::{
     net::{IpAddr, SocketAddr},
     sync::{

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -34,10 +34,8 @@ rayon = "1.5.1"
 retain_mut = "0.1.4"
 serde = "1.0.130"
 serde_derive = "1.0.103"
-solana-account-decoder = { path = "../account-decoder", version = "=1.9.0" }
 solana-accountsdb-plugin-manager = { path = "../accountsdb-plugin-manager", version = "=1.9.0" }
 solana-client = { path = "../client", version = "=1.9.0" }
-solana-config-program = { path = "../programs/config", version = "=1.9.0" }
 solana-entry = { path = "../entry", version = "=1.9.0" }
 solana-gossip = { path = "../gossip", version = "=1.9.0" }
 solana-ledger = { path = "../ledger", version = "=1.9.0" }
@@ -47,7 +45,6 @@ solana-metrics = { path = "../metrics", version = "=1.9.0" }
 solana-net-utils = { path = "../net-utils", version = "=1.9.0" }
 solana-perf = { path = "../perf", version = "=1.9.0" }
 solana-poh = { path = "../poh", version = "=1.9.0" }
-solana-program-test = { path = "../program-test", version = "=1.9.0" }
 solana-rpc = { path = "../rpc", version = "=1.9.0" }
 solana-replica-lib = { path = "../replica-lib", version = "=1.9.0" }
 solana-runtime = { path = "../runtime", version = "=1.9.0" }

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -50,7 +50,6 @@ pub mod sigverify_shreds;
 pub mod sigverify_stage;
 pub mod snapshot_packager_service;
 pub mod system_monitor_service;
-pub mod test_validator;
 pub mod tower_storage;
 pub mod tpu;
 pub mod tree_diff;

diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -292,7 +292,7 @@ pub struct Validator {
 }
 
 // in the distant future, get rid of ::new()/exit() and use Result properly...
-pub(crate) fn abort() -> ! {
+pub fn abort() -> ! {
     #[cfg(not(test))]
     {
         // standard error is usually redirected to a log file, cry for help on standard output as

diff --git a/rpc-test/Cargo.toml b/rpc-test/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "solana-rpc-test"
+version = "1.9.0"
+description = "Solana RPC Test"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+documentation = "https://docs.rs/solana-rpc-test"
+edition = "2018"
+
+[dependencies]
+bincode = "1.3.3"
+bs58 = "0.4.0"
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = { version = "18.0.0", features = ["ipc", "ws"] }
+log = "0.4.11"
+reqwest = { version = "0.11.5", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+serde = "1.0.130"
+serde_json = "1.0.68"
+solana-account-decoder = { path = "../account-decoder", version = "=1.9.0" }
+solana-client = { path = "../client", version = "=1.9.0" }
+solana-rpc = { path = "../rpc", version = "=1.9.0" }
+solana-sdk = { path = "../sdk", version = "=1.9.0" }
+solana-streamer = { path = "../streamer", version = "=1.9.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.9.0" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.9.0" }
+tokio = { version = "1", features = ["full"] }
+
+[dev-dependencies]
+solana-logger = { path = "../logger", version = "=1.9.0" }
+
+[lib]
+crate-type = ["lib"]
+name = "solana_entry"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc-test/src/lib.rs b/rpc-test/src/lib.rs
@@ -0,0 +1 @@
+// This is a test-only crate
diff --git a/core/tests/rpc.rs → rpc-test/tests/rpc.rs b/core/tests/rpc.rs → rpc-test/tests/rpc.rs
@@ -14,8 +14,8 @@ use solana_client::{
     rpc_response::{Response as RpcResponse, RpcSignatureResult, SlotUpdate},
     tpu_client::{TpuClient, TpuClientConfig},
 };
-use solana_core::test_validator::TestValidator;
 use solana_rpc::rpc_pubsub::gen_client::Client as PubsubClient;
+use solana_test_validator::TestValidator;
 
 use solana_sdk::{
     commitment_config::CommitmentConfig,