gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move test-validator to own module to reduce core dependencies (#20658)

Browse Source 
* 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>
This commit is contained in:
sakridge
2021-10-28 18:27:07 -07:00
committed by GitHub
parent e16c060abf
commit a8d78e89d3
26 changed files with 193 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/Cargo.toml
View File

@ -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]]

2
cli/tests/nonce.rs
View File

@ -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() {

2
cli/tests/program.rs
View File

@ -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]

2
cli/tests/request_airdrop.rs
View File

@ -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() {

2
cli/tests/stake.rs
View File

@ -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() {

2
cli/tests/transfer.rs
View File

@ -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() {

2
cli/tests/vote.rs
View File

@ -7,7 +7,6 @@ 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,
@ -15,6 +14,7 @@ use solana_sdk::{
signature::{Keypair, Signer},
};
use solana_streamer::socket::SocketAddrSpace;
use solana_test_validator::TestValidator;
use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
#[test]