blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More TestValidator cleanup

This commit is contained in:
Michael Vines 2020-11-25 17:00:47 -08:00 committed by mergify[bot]
parent b5f7e39be8
commit 43b82b31e5
13 changed files with 345 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cli/tests/deploy.rs
View File

@ -9,13 +9,7 @@ use solana_sdk::{
pubkey::Pubkey, pubkey::Pubkey,
signature::{Keypair, Signer}, signature::{Keypair, Signer},
}; };
use std::{ use std::{fs::File, io::Read, path::PathBuf, str::FromStr, sync::mpsc::channel};
fs::{remove_dir_all, File},
io::Read,
path::PathBuf,
str::FromStr,
sync::mpsc::channel,
};
#[test] #[test]
fn test_cli_deploy_program() { fn test_cli_deploy_program() {
@ -27,19 +21,13 @@ fn test_cli_deploy_program() {
pathbuf.push("noop"); pathbuf.push("noop");
pathbuf.set_extension("so"); pathbuf.set_extension("so");
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let mut file = File::open(pathbuf.to_str().unwrap()).unwrap(); let mut file = File::open(pathbuf.to_str().unwrap()).unwrap();
let mut program_data = Vec::new(); let mut program_data = Vec::new();
@ -50,7 +38,7 @@ fn test_cli_deploy_program() {
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
let keypair = Keypair::new(); let keypair = Keypair::new();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.command = CliCommand::Airdrop { config.command = CliCommand::Airdrop {
faucet_host: None, faucet_host: None,
faucet_port: faucet_addr.port(), faucet_port: faucet_addr.port(),
@ -153,6 +141,5 @@ fn test_cli_deploy_program() {
assert_eq!(account2.executable, true); assert_eq!(account2.executable, true);
assert_eq!(account0.data, account2.data); assert_eq!(account0.data, account2.data);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }

79
cli/tests/nonce.rs
View File

@ -9,7 +9,6 @@ use solana_client::{
nonce_utils, nonce_utils,
rpc_client::RpcClient, rpc_client::RpcClient,
}; };
use solana_core::contact_info::ContactInfo;
use solana_core::test_validator::TestValidator; use solana_core::test_validator::TestValidator;
use solana_faucet::faucet::run_local_faucet; use solana_faucet::faucet::run_local_faucet;
use solana_sdk::{ use solana_sdk::{
@ -19,69 +18,38 @@ use solana_sdk::{
signature::{keypair_from_seed, Keypair, Signer}, signature::{keypair_from_seed, Keypair, Signer},
system_program, system_program,
}; };
use std::{fs::remove_dir_all, sync::mpsc::channel}; use std::sync::mpsc::channel;
#[test] #[test]
fn test_nonce() { fn test_nonce() {
solana_logger::setup(); full_battery_tests(TestValidator::with_no_fees(), None, false);
let TestValidator {
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
full_battery_tests(leader_data, alice, None, false);
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_nonce_with_seed() { fn test_nonce_with_seed() {
let TestValidator { full_battery_tests(
server, TestValidator::with_no_fees(),
leader_data, Some(String::from("seed")),
alice, false,
ledger_path, );
..
} = TestValidator::with_no_fee();
full_battery_tests(leader_data, alice, Some(String::from("seed")), false);
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_nonce_with_authority() { fn test_nonce_with_authority() {
let TestValidator { full_battery_tests(TestValidator::with_no_fees(), None, true);
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
full_battery_tests(leader_data, alice, None, true);
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
fn full_battery_tests( fn full_battery_tests(
leader_data: ContactInfo, test_validator: TestValidator,
alice: Keypair,
seed: Option<String>, seed: Option<String>,
use_nonce_authority: bool, use_nonce_authority: bool,
) { ) {
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); let json_rpc_url = test_validator.rpc_url();
let mut config_payer = CliConfig::recent_for_tests(); let mut config_payer = CliConfig::recent_for_tests();
config_payer.json_rpc_url = json_rpc_url.clone(); config_payer.json_rpc_url = json_rpc_url.clone();
@ -227,21 +195,17 @@ fn full_battery_tests(
check_recent_balance(1000, &rpc_client, &config_payer.signers[0].pubkey()); check_recent_balance(1000, &rpc_client, &config_payer.signers[0].pubkey());
check_recent_balance(800, &rpc_client, &nonce_account); check_recent_balance(800, &rpc_client, &nonce_account);
check_recent_balance(200, &rpc_client, &payee_pubkey); check_recent_balance(200, &rpc_client, &payee_pubkey);
test_validator.close();
} }
#[test] #[test]
fn test_create_account_with_seed() { fn test_create_account_with_seed() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_custom_fees(1);
server,
leader_data,
alice: mint_keypair,
ledger_path,
..
} = TestValidator::with_custom_fee(1);
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(mint_keypair, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let offline_nonce_authority_signer = keypair_from_seed(&[1u8; 32]).unwrap(); let offline_nonce_authority_signer = keypair_from_seed(&[1u8; 32]).unwrap();
@ -250,7 +214,7 @@ fn test_create_account_with_seed() {
let config = CliConfig::recent_for_tests(); let config = CliConfig::recent_for_tests();
// Setup accounts // Setup accounts
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
request_and_confirm_airdrop( request_and_confirm_airdrop(
&rpc_client, &rpc_client,
&faucet_addr, &faucet_addr,
@ -282,8 +246,7 @@ fn test_create_account_with_seed() {
check_recent_balance(0, &rpc_client, &nonce_address); check_recent_balance(0, &rpc_client, &nonce_address);
let mut creator_config = CliConfig::recent_for_tests(); let mut creator_config = CliConfig::recent_for_tests();
creator_config.json_rpc_url = creator_config.json_rpc_url = test_validator.rpc_url();
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
creator_config.signers = vec![&online_nonce_creator_signer]; creator_config.signers = vec![&online_nonce_creator_signer];
creator_config.command = CliCommand::CreateNonceAccount { creator_config.command = CliCommand::CreateNonceAccount {
nonce_account: 0, nonce_account: 0,
@ -333,8 +296,7 @@ fn test_create_account_with_seed() {
// And submit it // And submit it
let mut submit_config = CliConfig::recent_for_tests(); let mut submit_config = CliConfig::recent_for_tests();
submit_config.json_rpc_url = submit_config.json_rpc_url = test_validator.rpc_url();
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
submit_config.signers = vec![&authority_presigner]; submit_config.signers = vec![&authority_presigner];
submit_config.command = CliCommand::Transfer { submit_config.command = CliCommand::Transfer {
amount: SpendAmount::Some(10), amount: SpendAmount::Some(10),
@ -356,6 +318,5 @@ fn test_create_account_with_seed() {
check_recent_balance(4000, &rpc_client, &online_nonce_creator_signer.pubkey()); check_recent_balance(4000, &rpc_client, &online_nonce_creator_signer.pubkey());
check_recent_balance(10, &rpc_client, &to_address); check_recent_balance(10, &rpc_client, &to_address);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }

20
cli/tests/request_airdrop.rs
View File

@ -3,23 +3,18 @@ use solana_client::rpc_client::RpcClient;
use solana_core::test_validator::TestValidator; use solana_core::test_validator::TestValidator;
use solana_faucet::faucet::run_local_faucet; use solana_faucet::faucet::run_local_faucet;
use solana_sdk::{commitment_config::CommitmentConfig, signature::Keypair}; use solana_sdk::{commitment_config::CommitmentConfig, signature::Keypair};
use std::{fs::remove_dir_all, sync::mpsc::channel}; use std::sync::mpsc::channel;
#[test] #[test]
fn test_cli_request_airdrop() { fn test_cli_request_airdrop() {
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let mut bob_config = CliConfig::recent_for_tests(); let mut bob_config = CliConfig::recent_for_tests();
bob_config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); bob_config.json_rpc_url = test_validator.rpc_url();
bob_config.command = CliCommand::Airdrop { bob_config.command = CliCommand::Airdrop {
faucet_host: None, faucet_host: None,
faucet_port: faucet_addr.port(), faucet_port: faucet_addr.port(),
@ -32,7 +27,7 @@ fn test_cli_request_airdrop() {
let sig_response = process_command(&bob_config); let sig_response = process_command(&bob_config);
sig_response.unwrap(); sig_response.unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let balance = rpc_client let balance = rpc_client
.get_balance_with_commitment(&bob_config.signers[0].pubkey(), CommitmentConfig::recent()) .get_balance_with_commitment(&bob_config.signers[0].pubkey(), CommitmentConfig::recent())
@ -40,6 +35,5 @@ fn test_cli_request_airdrop() {
.value; .value;
assert_eq!(balance, 50); assert_eq!(balance, 50);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }

196
cli/tests/stake.rs
View File

@ -22,26 +22,20 @@ use solana_stake_program::{
stake_instruction::LockupArgs, stake_instruction::LockupArgs,
stake_state::{Lockup, StakeAuthorize, StakeState}, stake_state::{Lockup, StakeAuthorize, StakeState},
}; };
use std::{fs::remove_dir_all, sync::mpsc::channel}; use std::sync::mpsc::channel;
#[test] #[test]
fn test_stake_delegation_force() { fn test_stake_delegation_force() {
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
request_and_confirm_airdrop( request_and_confirm_airdrop(
@ -114,32 +108,23 @@ fn test_stake_delegation_force() {
}; };
process_command(&config).unwrap(); process_command(&config).unwrap();
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_seed_stake_delegation_and_deactivation() { fn test_seed_stake_delegation_and_deactivation() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
vote_pubkey,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let validator_keypair = keypair_from_seed(&[0u8; 32]).unwrap(); let validator_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
let mut config_validator = CliConfig::recent_for_tests(); let mut config_validator = CliConfig::recent_for_tests();
config_validator.json_rpc_url = config_validator.json_rpc_url = test_validator.rpc_url();
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
config_validator.signers = vec![&validator_keypair]; config_validator.signers = vec![&validator_keypair];
request_and_confirm_airdrop( request_and_confirm_airdrop(
@ -180,7 +165,7 @@ fn test_seed_stake_delegation_and_deactivation() {
// Delegate stake // Delegate stake
config_validator.command = CliCommand::DelegateStake { config_validator.command = CliCommand::DelegateStake {
stake_account_pubkey: stake_address, stake_account_pubkey: stake_address,
vote_account_pubkey: vote_pubkey, vote_account_pubkey: test_validator.vote_account_address(),
stake_authority: 0, stake_authority: 0,
force: true, force: true,
sign_only: false, sign_only: false,
@ -203,32 +188,23 @@ fn test_seed_stake_delegation_and_deactivation() {
}; };
process_command(&config_validator).unwrap(); process_command(&config_validator).unwrap();
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_stake_delegation_and_deactivation() { fn test_stake_delegation_and_deactivation() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
vote_pubkey,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let validator_keypair = Keypair::new(); let validator_keypair = Keypair::new();
let mut config_validator = CliConfig::recent_for_tests(); let mut config_validator = CliConfig::recent_for_tests();
config_validator.json_rpc_url = config_validator.json_rpc_url = test_validator.rpc_url();
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
config_validator.signers = vec![&validator_keypair]; config_validator.signers = vec![&validator_keypair];
let stake_keypair = keypair_from_seed(&[0u8; 32]).unwrap(); let stake_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
@ -265,7 +241,7 @@ fn test_stake_delegation_and_deactivation() {
config_validator.signers.pop(); config_validator.signers.pop();
config_validator.command = CliCommand::DelegateStake { config_validator.command = CliCommand::DelegateStake {
stake_account_pubkey: stake_keypair.pubkey(), stake_account_pubkey: stake_keypair.pubkey(),
vote_account_pubkey: vote_pubkey, vote_account_pubkey: test_validator.vote_account_address(),
stake_authority: 0, stake_authority: 0,
force: true, force: true,
sign_only: false, sign_only: false,
@ -288,37 +264,27 @@ fn test_stake_delegation_and_deactivation() {
}; };
process_command(&config_validator).unwrap(); process_command(&config_validator).unwrap();
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_offline_stake_delegation_and_deactivation() { fn test_offline_stake_delegation_and_deactivation() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
vote_pubkey,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let mut config_validator = CliConfig::recent_for_tests(); let mut config_validator = CliConfig::recent_for_tests();
config_validator.json_rpc_url = config_validator.json_rpc_url = test_validator.rpc_url();
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
let validator_keypair = Keypair::new(); let validator_keypair = Keypair::new();
config_validator.signers = vec![&validator_keypair]; config_validator.signers = vec![&validator_keypair];
let mut config_payer = CliConfig::recent_for_tests(); let mut config_payer = CliConfig::recent_for_tests();
config_payer.json_rpc_url = config_payer.json_rpc_url = test_validator.rpc_url();
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
let stake_keypair = keypair_from_seed(&[0u8; 32]).unwrap(); let stake_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
@ -372,7 +338,7 @@ fn test_offline_stake_delegation_and_deactivation() {
let (blockhash, _) = rpc_client.get_recent_blockhash().unwrap(); let (blockhash, _) = rpc_client.get_recent_blockhash().unwrap();
config_offline.command = CliCommand::DelegateStake { config_offline.command = CliCommand::DelegateStake {
stake_account_pubkey: stake_keypair.pubkey(), stake_account_pubkey: stake_keypair.pubkey(),
vote_account_pubkey: vote_pubkey, vote_account_pubkey: test_validator.vote_account_address(),
stake_authority: 0, stake_authority: 0,
force: true, force: true,
sign_only: true, sign_only: true,
@ -391,7 +357,7 @@ fn test_offline_stake_delegation_and_deactivation() {
config_payer.signers = vec![&offline_presigner]; config_payer.signers = vec![&offline_presigner];
config_payer.command = CliCommand::DelegateStake { config_payer.command = CliCommand::DelegateStake {
stake_account_pubkey: stake_keypair.pubkey(), stake_account_pubkey: stake_keypair.pubkey(),
vote_account_pubkey: vote_pubkey, vote_account_pubkey: test_validator.vote_account_address(),
stake_authority: 0, stake_authority: 0,
force: true, force: true,
sign_only: false, sign_only: false,
@ -431,32 +397,24 @@ fn test_offline_stake_delegation_and_deactivation() {
}; };
process_command(&config_payer).unwrap(); process_command(&config_payer).unwrap();
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_nonced_stake_delegation_and_deactivation() { fn test_nonced_stake_delegation_and_deactivation() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
vote_pubkey,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let config_keypair = keypair_from_seed(&[0u8; 32]).unwrap(); let config_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.signers = vec![&config_keypair]; config.signers = vec![&config_keypair];
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
let minimum_nonce_balance = rpc_client let minimum_nonce_balance = rpc_client
.get_minimum_balance_for_rent_exemption(NonceState::size()) .get_minimum_balance_for_rent_exemption(NonceState::size())
@ -515,7 +473,7 @@ fn test_nonced_stake_delegation_and_deactivation() {
config.signers = vec![&config_keypair]; config.signers = vec![&config_keypair];
config.command = CliCommand::DelegateStake { config.command = CliCommand::DelegateStake {
stake_account_pubkey: stake_keypair.pubkey(), stake_account_pubkey: stake_keypair.pubkey(),
vote_account_pubkey: vote_pubkey, vote_account_pubkey: test_validator.vote_account_address(),
stake_authority: 0, stake_authority: 0,
force: true, force: true,
sign_only: false, sign_only: false,
@ -554,30 +512,23 @@ fn test_nonced_stake_delegation_and_deactivation() {
}; };
process_command(&config).unwrap(); process_command(&config).unwrap();
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_stake_authorize() { fn test_stake_authorize() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
request_and_confirm_airdrop( request_and_confirm_airdrop(
@ -833,8 +784,7 @@ fn test_stake_authorize() {
.blockhash; .blockhash;
assert_ne!(nonce_hash, new_nonce_hash); assert_ne!(nonce_hash, new_nonce_hash);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
@ -842,30 +792,23 @@ fn test_stake_authorize_with_fee_payer() {
solana_logger::setup(); solana_logger::setup();
const SIG_FEE: u64 = 42; const SIG_FEE: u64 = 42;
let TestValidator { let test_validator = TestValidator::with_custom_fees(SIG_FEE);
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_custom_fee(SIG_FEE);
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let default_pubkey = default_signer.pubkey(); let default_pubkey = default_signer.pubkey();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
let payer_keypair = keypair_from_seed(&[0u8; 32]).unwrap(); let payer_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
let mut config_payer = CliConfig::recent_for_tests(); let mut config_payer = CliConfig::recent_for_tests();
config_payer.signers = vec![&payer_keypair]; config_payer.signers = vec![&payer_keypair];
config_payer.json_rpc_url = config_payer.json_rpc_url = test_validator.rpc_url();
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
let payer_pubkey = config_payer.signers[0].pubkey(); let payer_pubkey = config_payer.signers[0].pubkey();
let mut config_offline = CliConfig::recent_for_tests(); let mut config_offline = CliConfig::recent_for_tests();
@ -967,31 +910,24 @@ fn test_stake_authorize_with_fee_payer() {
// and fee payer // and fee payer
check_recent_balance(100_000 - SIG_FEE, &rpc_client, &offline_pubkey); check_recent_balance(100_000 - SIG_FEE, &rpc_client, &offline_pubkey);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_stake_split() { fn test_stake_split() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_custom_fees(1);
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_custom_fee(1);
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let offline_signer = Keypair::new(); let offline_signer = Keypair::new();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
let mut config_offline = CliConfig::recent_for_tests(); let mut config_offline = CliConfig::recent_for_tests();
@ -1118,31 +1054,24 @@ fn test_stake_split() {
&split_account.pubkey(), &split_account.pubkey(),
); );
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_stake_set_lockup() { fn test_stake_set_lockup() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_custom_fees(1);
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_custom_fee(1);
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let offline_signer = Keypair::new(); let offline_signer = Keypair::new();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
let mut config_offline = CliConfig::recent_for_tests(); let mut config_offline = CliConfig::recent_for_tests();
@ -1387,31 +1316,23 @@ fn test_stake_set_lockup() {
assert_eq!(current_lockup.epoch, lockup.epoch.unwrap()); assert_eq!(current_lockup.epoch, lockup.epoch.unwrap());
assert_eq!(current_lockup.custodian, offline_pubkey); assert_eq!(current_lockup.custodian, offline_pubkey);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_offline_nonced_create_stake_account_and_withdraw() { fn test_offline_nonced_create_stake_account_and_withdraw() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
let default_signer = keypair_from_seed(&[1u8; 32]).unwrap(); let default_signer = keypair_from_seed(&[1u8; 32]).unwrap();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
let mut config_offline = CliConfig::recent_for_tests(); let mut config_offline = CliConfig::recent_for_tests();
let offline_signer = keypair_from_seed(&[2u8; 32]).unwrap(); let offline_signer = keypair_from_seed(&[2u8; 32]).unwrap();
@ -1608,6 +1529,5 @@ fn test_offline_nonced_create_stake_account_and_withdraw() {
Pubkey::create_with_seed(&stake_pubkey, seed, &solana_stake_program::id()).unwrap(); Pubkey::create_with_seed(&stake_pubkey, seed, &solana_stake_program::id()).unwrap();
check_recent_balance(50_000, &rpc_client, &seed_address); check_recent_balance(50_000, &rpc_client, &seed_address);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }

53
cli/tests/transfer.rs
View File

@ -17,30 +17,24 @@ use solana_sdk::{
pubkey::Pubkey, pubkey::Pubkey,
signature::{keypair_from_seed, Keypair, NullSigner, Signer}, signature::{keypair_from_seed, Keypair, NullSigner, Signer},
}; };
use std::{fs::remove_dir_all, sync::mpsc::channel}; use std::sync::mpsc::channel;
#[test] #[test]
fn test_transfer() { fn test_transfer() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_custom_fees(1);
server,
leader_data,
alice: mint_keypair,
ledger_path,
..
} = TestValidator::with_custom_fee(1);
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(mint_keypair, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let default_offline_signer = Keypair::new(); let default_offline_signer = Keypair::new();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
let sender_pubkey = config.signers[0].pubkey(); let sender_pubkey = config.signers[0].pubkey();
@ -243,23 +237,16 @@ fn test_transfer() {
check_recent_balance(28, &rpc_client, &offline_pubkey); check_recent_balance(28, &rpc_client, &offline_pubkey);
check_recent_balance(40, &rpc_client, &recipient_pubkey); check_recent_balance(40, &rpc_client, &recipient_pubkey);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_transfer_multisession_signing() { fn test_transfer_multisession_signing() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_custom_fees(1);
server,
leader_data,
alice: mint_keypair,
ledger_path,
..
} = TestValidator::with_custom_fee(1);
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(mint_keypair, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let to_pubkey = Pubkey::new(&[1u8; 32]); let to_pubkey = Pubkey::new(&[1u8; 32]);
@ -269,7 +256,7 @@ fn test_transfer_multisession_signing() {
let config = CliConfig::recent_for_tests(); let config = CliConfig::recent_for_tests();
// Setup accounts // Setup accounts
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
request_and_confirm_airdrop( request_and_confirm_airdrop(
&rpc_client, &rpc_client,
&faucet_addr, &faucet_addr,
@ -351,7 +338,7 @@ fn test_transfer_multisession_signing() {
// Finally submit to the cluster // Finally submit to the cluster
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&fee_payer_presigner, &from_presigner]; config.signers = vec![&fee_payer_presigner, &from_presigner];
config.command = CliCommand::Transfer { config.command = CliCommand::Transfer {
amount: SpendAmount::Some(42), amount: SpendAmount::Some(42),
@ -370,31 +357,24 @@ fn test_transfer_multisession_signing() {
check_recent_balance(1, &rpc_client, &offline_fee_payer_signer.pubkey()); check_recent_balance(1, &rpc_client, &offline_fee_payer_signer.pubkey());
check_recent_balance(42, &rpc_client, &to_pubkey); check_recent_balance(42, &rpc_client, &to_pubkey);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_transfer_all() { fn test_transfer_all() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_custom_fees(1);
server,
leader_data,
alice: mint_keypair,
ledger_path,
..
} = TestValidator::with_custom_fee(1);
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(mint_keypair, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
let sender_pubkey = config.signers[0].pubkey(); let sender_pubkey = config.signers[0].pubkey();
@ -423,6 +403,5 @@ fn test_transfer_all() {
check_recent_balance(0, &rpc_client, &sender_pubkey); check_recent_balance(0, &rpc_client, &sender_pubkey);
check_recent_balance(49_999, &rpc_client, &recipient_pubkey); check_recent_balance(49_999, &rpc_client, &recipient_pubkey);
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }

19
cli/tests/vote.rs
View File

@ -15,26 +15,20 @@ use solana_sdk::{
signature::{Keypair, Signer}, signature::{Keypair, Signer},
}; };
use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions}; use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
use std::{fs::remove_dir_all, sync::mpsc::channel}; use std::sync::mpsc::channel;
#[test] #[test]
fn test_vote_authorize_and_withdraw() { fn test_vote_authorize_and_withdraw() {
let TestValidator { let test_validator = TestValidator::with_no_fees();
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let (sender, receiver) = channel(); let (sender, receiver) = channel();
run_local_faucet(alice, sender, None); run_local_faucet(test_validator.mint_keypair(), sender, None);
let faucet_addr = receiver.recv().unwrap(); let faucet_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let default_signer = Keypair::new(); let default_signer = Keypair::new();
let mut config = CliConfig::recent_for_tests(); let mut config = CliConfig::recent_for_tests();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port()); config.json_rpc_url = test_validator.rpc_url();
config.signers = vec![&default_signer]; config.signers = vec![&default_signer];
request_and_confirm_airdrop( request_and_confirm_airdrop(
@ -131,6 +125,5 @@ fn test_vote_authorize_and_withdraw() {
}; };
process_command(&config).unwrap(); process_command(&config).unwrap();
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }

2
client/src/rpc_client.rs
View File

@ -1437,7 +1437,7 @@ fn new_spinner_progress_bar() -> ProgressBar {
progress_bar progress_bar
} }
pub fn get_rpc_request_str(rpc_addr: SocketAddr, tls: bool) -> String { fn get_rpc_request_str(rpc_addr: SocketAddr, tls: bool) -> String {
if tls { if tls {
format!("https://{}", rpc_addr) format!("https://{}", rpc_addr)
} else { } else {

149
core/src/test_validator.rs
View File

@ -1,8 +1,6 @@
use { use {
crate::{ crate::{
cluster_info::Node, cluster_info::Node,
contact_info::ContactInfo,
gossip_service::discover_cluster,
validator::{Validator, ValidatorConfig}, validator::{Validator, ValidatorConfig},
}, },
solana_ledger::create_new_tmp_ledger, solana_ledger::create_new_tmp_ledger,
@ -11,83 +9,111 @@ use {
hash::Hash, hash::Hash,
native_token::sol_to_lamports, native_token::sol_to_lamports,
pubkey::Pubkey, pubkey::Pubkey,
rent::Rent,
signature::{Keypair, Signer}, signature::{Keypair, Signer},
}, },
std::{path::PathBuf, sync::Arc}, std::{fs::remove_dir_all, net::SocketAddr, path::PathBuf, sync::Arc},
}; };
pub struct TestValidator { pub struct TestValidatorConfig {
pub server: Validator, pub fee_rate_governor: FeeRateGovernor,
pub leader_data: ContactInfo, pub mint_lamports: u64,
pub alice: Keypair, pub rent: Rent,
pub ledger_path: PathBuf, pub validator_identity_keypair: Keypair,
pub genesis_hash: Hash, pub validator_identity_lamports: u64,
pub vote_pubkey: Pubkey, pub validator_stake_lamports: u64,
}
struct TestValidatorConfig {
fee_rate_governor: FeeRateGovernor,
validator_identity_lamports: u64,
validator_stake_lamports: u64,
mint_lamports: u64,
} }
impl Default for TestValidatorConfig { impl Default for TestValidatorConfig {
fn default() -> Self { fn default() -> Self {
TestValidatorConfig { Self {
fee_rate_governor: FeeRateGovernor::new(0, 0), fee_rate_governor: FeeRateGovernor::default(),
mint_lamports: sol_to_lamports(500_000_000.),
rent: Rent::default(),
validator_identity_keypair: Keypair::new(),
validator_identity_lamports: sol_to_lamports(500.), validator_identity_lamports: sol_to_lamports(500.),
validator_stake_lamports: sol_to_lamports(1.), validator_stake_lamports: sol_to_lamports(1.),
mint_lamports: sol_to_lamports(500_000_000.),
} }
} }
} }
pub struct TestValidator {
validator: Validator,
ledger_path: PathBuf,
preserve_ledger: bool,
genesis_hash: Hash,
mint_keypair: Keypair,
vote_account_address: Pubkey,
tpu: SocketAddr,
rpc_url: String,
rpc_pubsub_url: String,
}
impl Default for TestValidator {
fn default() -> Self {
Self::new(TestValidatorConfig::default())
}
}
impl TestValidator { impl TestValidator {
pub fn with_no_fee() -> Self { pub fn with_no_fees() -> Self {
Self::new(TestValidatorConfig { Self::new(TestValidatorConfig {
fee_rate_governor: FeeRateGovernor::new(0, 0), fee_rate_governor: FeeRateGovernor::new(0, 0),
rent: Rent {
lamports_per_byte_year: 1,
exemption_threshold: 1.0,
..Rent::default()
},
..TestValidatorConfig::default() ..TestValidatorConfig::default()
}) })
} }
pub fn with_custom_fee(target_lamports_per_signature: u64) -> Self { pub fn with_custom_fees(target_lamports_per_signature: u64) -> Self {
Self::new(TestValidatorConfig { Self::new(TestValidatorConfig {
fee_rate_governor: FeeRateGovernor::new(target_lamports_per_signature, 0), fee_rate_governor: FeeRateGovernor::new(target_lamports_per_signature, 0),
rent: Rent {
lamports_per_byte_year: 1,
exemption_threshold: 1.0,
..Rent::default()
},
..TestValidatorConfig::default() ..TestValidatorConfig::default()
}) })
} }
fn new(config: TestValidatorConfig) -> Self { pub fn new(config: TestValidatorConfig) -> Self {
use solana_ledger::genesis_utils::{ use solana_ledger::genesis_utils::{
create_genesis_config_with_leader_ex, GenesisConfigInfo, create_genesis_config_with_leader_ex, GenesisConfigInfo,
}; };
let TestValidatorConfig { let TestValidatorConfig {
fee_rate_governor, fee_rate_governor,
mint_lamports,
rent,
validator_identity_keypair,
validator_identity_lamports, validator_identity_lamports,
validator_stake_lamports, validator_stake_lamports,
mint_lamports,
} = config; } = config;
let node_keypair = Arc::new(Keypair::new()); let validator_identity_keypair = Arc::new(validator_identity_keypair);
let node = Node::new_localhost_with_pubkey(&node_keypair.pubkey());
let contact_info = node.info.clone(); let node = Node::new_localhost_with_pubkey(&validator_identity_keypair.pubkey());
let GenesisConfigInfo { let GenesisConfigInfo {
mut genesis_config, mut genesis_config,
mint_keypair, mint_keypair,
voting_keypair, voting_keypair: vote_account_keypair,
} = create_genesis_config_with_leader_ex( } = create_genesis_config_with_leader_ex(
mint_lamports, mint_lamports,
&contact_info.id, &node.info.id,
&Keypair::new(), &Keypair::new(),
&solana_sdk::pubkey::new_rand(), &Keypair::new().pubkey(),
validator_stake_lamports, validator_stake_lamports,
validator_identity_lamports, validator_identity_lamports,
solana_sdk::genesis_config::ClusterType::Development, solana_sdk::genesis_config::ClusterType::Development,
); );
genesis_config.rent.lamports_per_byte_year = 1;
genesis_config.rent.exemption_threshold = 1.0; genesis_config.rent = rent;
genesis_config.fee_rate_governor = fee_rate_governor; genesis_config.fee_rate_governor = fee_rate_governor;
let (ledger_path, blockhash) = create_new_tmp_ledger!(&genesis_config); let (ledger_path, blockhash) = create_new_tmp_ledger!(&genesis_config);
@ -96,24 +122,63 @@ impl TestValidator {
rpc_addrs: Some((node.info.rpc, node.info.rpc_pubsub, node.info.rpc_banks)), rpc_addrs: Some((node.info.rpc, node.info.rpc_pubsub, node.info.rpc_banks)),
..ValidatorConfig::default() ..ValidatorConfig::default()
}; };
let vote_pubkey = voting_keypair.pubkey();
let node = Validator::new( let vote_account_address = vote_account_keypair.pubkey();
let rpc_url = format!("http://{}:{}", node.info.rpc.ip(), node.info.rpc.port());
let rpc_pubsub_url = format!("ws://{}/", node.info.rpc_pubsub);
let tpu = node.info.tpu;
let validator = Validator::new(
node, node,
&node_keypair, &validator_identity_keypair,
&ledger_path, &ledger_path,
&voting_keypair.pubkey(), &vote_account_keypair.pubkey(),
vec![Arc::new(voting_keypair)], vec![Arc::new(vote_account_keypair)],
None, None,
&config, &config,
); );
discover_cluster(&contact_info.gossip, 1).expect("Node startup failed");
TestValidator { TestValidator {
server: node, validator,
leader_data: contact_info, vote_account_address,
alice: mint_keypair, mint_keypair,
ledger_path, ledger_path,
genesis_hash: blockhash, genesis_hash: blockhash,
vote_pubkey, tpu,
rpc_url,
rpc_pubsub_url,
preserve_ledger: false,
} }
} }
pub fn close(self) {
self.validator.close().unwrap();
if !self.preserve_ledger {
remove_dir_all(&self.ledger_path).unwrap();
}
}
pub fn tpu(&self) -> &SocketAddr {
&self.tpu
}
pub fn mint_keypair(&self) -> Keypair {
Keypair::from_bytes(&self.mint_keypair.to_bytes()).unwrap()
}
pub fn rpc_url(&self) -> String {
self.rpc_url.clone()
}
pub fn rpc_pubsub_url(&self) -> String {
self.rpc_pubsub_url.clone()
}
pub fn genesis_hash(&self) -> Hash {
self.genesis_hash
}
pub fn vote_account_address(&self) -> Pubkey {
self.vote_account_address
}
} }

17
core/tests/client.rs
View File

@ -16,7 +16,6 @@ use solana_sdk::{
signature::Signer, system_transaction, signature::Signer, system_transaction,
}; };
use std::{ use std::{
fs::remove_dir_all,
net::{IpAddr, SocketAddr}, net::{IpAddr, SocketAddr},
sync::{ sync::{
atomic::{AtomicBool, Ordering}, atomic::{AtomicBool, Ordering},
@ -31,16 +30,12 @@ use systemstat::Ipv4Addr;
fn test_rpc_client() { fn test_rpc_client() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server, let alice = test_validator.mint_keypair();
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let bob_pubkey = solana_sdk::pubkey::new_rand(); let bob_pubkey = solana_sdk::pubkey::new_rand();
let client = RpcClient::new_socket(leader_data.rpc); let client = RpcClient::new(test_validator.rpc_url());
assert_eq!( assert_eq!(
client.get_version().unwrap().solana_core, client.get_version().unwrap().solana_core,
@ -84,9 +79,7 @@ fn test_rpc_client() {
client.get_balance(&alice.pubkey()).unwrap(), client.get_balance(&alice.pubkey()).unwrap(),
original_alice_balance - sol_to_lamports(20.0) original_alice_balance - sol_to_lamports(20.0)
); );
test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]

79
core/tests/rpc.rs
View File

@ -9,10 +9,9 @@ use reqwest::{self, header::CONTENT_TYPE};
use serde_json::{json, Value}; use serde_json::{json, Value};
use solana_account_decoder::UiAccount; use solana_account_decoder::UiAccount;
use solana_client::{ use solana_client::{
rpc_client::{get_rpc_request_str, RpcClient}, rpc_client::RpcClient,
rpc_response::{Response, RpcSignatureResult}, rpc_response::{Response, RpcSignatureResult},
}; };
use solana_core::contact_info::ContactInfo;
use solana_core::{rpc_pubsub::gen_client::Client as PubsubClient, test_validator::TestValidator}; use solana_core::{rpc_pubsub::gen_client::Client as PubsubClient, test_validator::TestValidator};
use solana_sdk::{ use solana_sdk::{
commitment_config::CommitmentConfig, hash::Hash, signature::Signer, system_transaction, commitment_config::CommitmentConfig, hash::Hash, signature::Signer, system_transaction,
@ -20,7 +19,6 @@ use solana_sdk::{
}; };
use std::{ use std::{
collections::HashSet, collections::HashSet,
fs::remove_dir_all,
net::UdpSocket, net::UdpSocket,
sync::mpsc::channel, sync::mpsc::channel,
thread::sleep, thread::sleep,
@ -39,12 +37,10 @@ macro_rules! json_req {
}} }}
} }
fn post_rpc(request: Value, data: &ContactInfo) -> Value { fn post_rpc(request: Value, rpc_url: &str) -> Value {
let client = reqwest::blocking::Client::new(); let client = reqwest::blocking::Client::new();
let rpc_addr = data.rpc;
let rpc_string = get_rpc_request_str(rpc_addr, false);
let response = client let response = client
.post(&rpc_string) .post(rpc_url)
.header(CONTENT_TYPE, "application/json") .header(CONTENT_TYPE, "application/json")
.body(request.to_string()) .body(request.to_string())
.send() .send()
@ -56,17 +52,14 @@ fn post_rpc(request: Value, data: &ContactInfo) -> Value {
fn test_rpc_send_tx() { fn test_rpc_send_tx() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server, let alice = test_validator.mint_keypair();
leader_data, let rpc_url = test_validator.rpc_url();
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let bob_pubkey = solana_sdk::pubkey::new_rand(); let bob_pubkey = solana_sdk::pubkey::new_rand();
let req = json_req!("getRecentBlockhash", json!([])); let req = json_req!("getRecentBlockhash", json!([]));
let json = post_rpc(req, &leader_data); let json = post_rpc(req, &rpc_url);
let blockhash: Hash = json["result"]["value"]["blockhash"] let blockhash: Hash = json["result"]["value"]["blockhash"]
.as_str() .as_str()
@ -79,7 +72,7 @@ fn test_rpc_send_tx() {
let serialized_encoded_tx = bs58::encode(serialize(&tx).unwrap()).into_string(); let serialized_encoded_tx = bs58::encode(serialize(&tx).unwrap()).into_string();
let req = json_req!("sendTransaction", json!([serialized_encoded_tx])); let req = json_req!("sendTransaction", json!([serialized_encoded_tx]));
let json: Value = post_rpc(req, &leader_data); let json: Value = post_rpc(req, &rpc_url);
let signature = &json["result"]; let signature = &json["result"];
@ -88,7 +81,7 @@ fn test_rpc_send_tx() {
let request = json_req!("confirmTransaction", [signature]); let request = json_req!("confirmTransaction", [signature]);
for _ in 0..solana_sdk::clock::DEFAULT_TICKS_PER_SLOT { for _ in 0..solana_sdk::clock::DEFAULT_TICKS_PER_SLOT {
let json = post_rpc(request.clone(), &leader_data); let json = post_rpc(request.clone(), &rpc_url);
if true == json["result"]["value"] { if true == json["result"]["value"] {
confirmed_tx = true; confirmed_tx = true;
@ -111,70 +104,62 @@ fn test_rpc_send_tx() {
"getAccountInfo", "getAccountInfo",
json!([bs58::encode(bob_pubkey).into_string(), config]) json!([bs58::encode(bob_pubkey).into_string(), config])
); );
let json: Value = post_rpc(req, &leader_data); let json: Value = post_rpc(req, &rpc_url);
info!("{:?}", json["result"]["value"]); info!("{:?}", json["result"]["value"]);
test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_rpc_invalid_requests() { fn test_rpc_invalid_requests() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server, let rpc_url = test_validator.rpc_url();
leader_data,
ledger_path,
..
} = TestValidator::with_no_fee();
let bob_pubkey = solana_sdk::pubkey::new_rand(); let bob_pubkey = solana_sdk::pubkey::new_rand();
// test invalid get_balance request // test invalid get_balance request
let req = json_req!("getBalance", json!(["invalid9999"])); let req = json_req!("getBalance", json!(["invalid9999"]));
let json = post_rpc(req, &leader_data); let json = post_rpc(req, &rpc_url);
let the_error = json["error"]["message"].as_str().unwrap(); let the_error = json["error"]["message"].as_str().unwrap();
assert_eq!(the_error, "Invalid param: Invalid"); assert_eq!(the_error, "Invalid param: Invalid");
// test invalid get_account_info request // test invalid get_account_info request
let req = json_req!("getAccountInfo", json!(["invalid9999"])); let req = json_req!("getAccountInfo", json!(["invalid9999"]));
let json = post_rpc(req, &leader_data); let json = post_rpc(req, &rpc_url);
let the_error = json["error"]["message"].as_str().unwrap(); let the_error = json["error"]["message"].as_str().unwrap();
assert_eq!(the_error, "Invalid param: Invalid"); assert_eq!(the_error, "Invalid param: Invalid");
// test invalid get_account_info request // test invalid get_account_info request
let req = json_req!("getAccountInfo", json!([bob_pubkey.to_string()])); let req = json_req!("getAccountInfo", json!([bob_pubkey.to_string()]));
let json = post_rpc(req, &leader_data); let json = post_rpc(req, &rpc_url);
let the_value = &json["result"]["value"]; let the_value = &json["result"]["value"];
assert!(the_value.is_null()); assert!(the_value.is_null());
test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_rpc_subscriptions() { fn test_rpc_subscriptions() {
solana_logger::setup(); solana_logger::setup();
let TestValidator { let test_validator = TestValidator::with_no_fees();
server, let alice = test_validator.mint_keypair();
leader_data,
alice,
ledger_path,
genesis_hash,
..
} = TestValidator::with_no_fee();
let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap(); let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
transactions_socket.connect(leader_data.tpu).unwrap(); transactions_socket.connect(test_validator.tpu()).unwrap();
// Create transaction signatures to subscribe to // Create transaction signatures to subscribe to
let transactions: Vec<Transaction> = (0..1000) let transactions: Vec<Transaction> = (0..1000)
.map(|_| { .map(|_| {
system_transaction::transfer(&alice, &solana_sdk::pubkey::new_rand(), 1, genesis_hash) system_transaction::transfer(
&alice,
&solana_sdk::pubkey::new_rand(),
1,
test_validator.genesis_hash(),
)
}) })
.collect(); .collect();
let mut signature_set: HashSet<String> = transactions let mut signature_set: HashSet<String> = transactions
@ -195,11 +180,10 @@ fn test_rpc_subscriptions() {
// Create the pub sub runtime // Create the pub sub runtime
let mut rt = Runtime::new().unwrap(); let mut rt = Runtime::new().unwrap();
let rpc_pubsub_url = format!("ws://{}/", leader_data.rpc_pubsub);
// Subscribe to all signatures // Subscribe to all signatures
rt.spawn({ rt.spawn({
let connect = ws::try_connect::<PubsubClient>(&rpc_pubsub_url).unwrap(); let connect = ws::try_connect::<PubsubClient>(&test_validator.rpc_pubsub_url()).unwrap();
let signature_set = signature_set.clone(); let signature_set = signature_set.clone();
connect connect
.and_then(move |client| { .and_then(move |client| {
@ -256,7 +240,7 @@ fn test_rpc_subscriptions() {
// Wait for signature subscriptions // Wait for signature subscriptions
ready_receiver.recv_timeout(Duration::from_secs(2)).unwrap(); ready_receiver.recv_timeout(Duration::from_secs(2)).unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc); let rpc_client = RpcClient::new(test_validator.rpc_url());
let mut mint_balance = rpc_client let mut mint_balance = rpc_client
.get_balance_with_commitment(&alice.pubkey(), CommitmentConfig::recent()) .get_balance_with_commitment(&alice.pubkey(), CommitmentConfig::recent())
.unwrap() .unwrap()
@ -326,6 +310,5 @@ fn test_rpc_subscriptions() {
} }
rt.shutdown_now().wait().unwrap(); rt.shutdown_now().wait().unwrap();
server.close().unwrap(); test_validator.close();
remove_dir_all(ledger_path).unwrap();
} }

66
runtime/src/genesis_utils.rs
View File

@ -14,8 +14,8 @@ use solana_stake_program::stake_state::StakeState;
use solana_vote_program::vote_state; use solana_vote_program::vote_state;
use std::borrow::Borrow; use std::borrow::Borrow;
// Default amount received by the bootstrap validator // Default amount received by the validator
const BOOTSTRAP_VALIDATOR_LAMPORTS: u64 = 42; const VALIDATOR_LAMPORTS: u64 = 42;
// fun fact: rustc is very close to make this const fn. // fun fact: rustc is very close to make this const fn.
pub fn bootstrap_validator_stake_lamports() -> u64 { pub fn bootstrap_validator_stake_lamports() -> u64 {
@ -84,7 +84,7 @@ pub fn create_genesis_config_with_vote_accounts_and_cluster_type(
&voting_keypairs[0].borrow().vote_keypair, &voting_keypairs[0].borrow().vote_keypair,
&voting_keypairs[0].borrow().stake_keypair.pubkey(), &voting_keypairs[0].borrow().stake_keypair.pubkey(),
stakes[0], stakes[0],
BOOTSTRAP_VALIDATOR_LAMPORTS, VALIDATOR_LAMPORTS,
cluster_type, cluster_type,
); );
@ -94,7 +94,7 @@ pub fn create_genesis_config_with_vote_accounts_and_cluster_type(
let stake_pubkey = validator_voting_keypairs.borrow().stake_keypair.pubkey(); let stake_pubkey = validator_voting_keypairs.borrow().stake_keypair.pubkey();
// Create accounts // Create accounts
let node_account = Account::new(BOOTSTRAP_VALIDATOR_LAMPORTS, 0, &system_program::id()); let node_account = Account::new(VALIDATOR_LAMPORTS, 0, &system_program::id());
let vote_account = vote_state::create_account(&vote_pubkey, &node_pubkey, 0, *stake); let vote_account = vote_state::create_account(&vote_pubkey, &node_pubkey, 0, *stake);
let stake_account = stake_state::create_account( let stake_account = stake_state::create_account(
&stake_pubkey, &stake_pubkey,
@ -117,16 +117,16 @@ pub fn create_genesis_config_with_vote_accounts_and_cluster_type(
pub fn create_genesis_config_with_leader( pub fn create_genesis_config_with_leader(
mint_lamports: u64, mint_lamports: u64,
bootstrap_validator_pubkey: &Pubkey, validator_pubkey: &Pubkey,
bootstrap_validator_stake_lamports: u64, validator_stake_lamports: u64,
) -> GenesisConfigInfo { ) -> GenesisConfigInfo {
create_genesis_config_with_leader_ex( create_genesis_config_with_leader_ex(
mint_lamports, mint_lamports,
bootstrap_validator_pubkey, validator_pubkey,
&Keypair::new(), &Keypair::new(),
&solana_sdk::pubkey::new_rand(), &solana_sdk::pubkey::new_rand(),
bootstrap_validator_stake_lamports, validator_stake_lamports,
BOOTSTRAP_VALIDATOR_LAMPORTS, VALIDATOR_LAMPORTS,
ClusterType::Development, ClusterType::Development,
) )
} }
@ -148,29 +148,30 @@ pub fn activate_all_features(genesis_config: &mut GenesisConfig) {
pub fn create_genesis_config_with_leader_ex( pub fn create_genesis_config_with_leader_ex(
mint_lamports: u64, mint_lamports: u64,
bootstrap_validator_pubkey: &Pubkey, validator_pubkey: &Pubkey,
bootstrap_validator_voting_keypair: &Keypair, validator_vote_account_keypair: &Keypair,
bootstrap_validator_staking_pubkey: &Pubkey, validator_stake_account_pubkey: &Pubkey,
bootstrap_validator_stake_lamports: u64, validator_stake_lamports: u64,
bootstrap_validator_lamports: u64, validator_lamports: u64,
cluster_type: ClusterType, cluster_type: ClusterType,
) -> GenesisConfigInfo { ) -> GenesisConfigInfo {
let mint_keypair = Keypair::new(); let mint_keypair = Keypair::new();
let bootstrap_validator_vote_account = vote_state::create_account( let validator_vote_account = vote_state::create_account(
&bootstrap_validator_voting_keypair.pubkey(), &validator_vote_account_keypair.pubkey(),
&bootstrap_validator_pubkey, &validator_pubkey,
0, 0,
bootstrap_validator_stake_lamports, validator_stake_lamports,
); );
let rent = Rent::free(); let fee_rate_governor = FeeRateGovernor::new(0, 0); // most tests can't handle transaction fees
let rent = Rent::free(); // most tests don't expect rent
let bootstrap_validator_stake_account = stake_state::create_account( let validator_stake_account = stake_state::create_account(
bootstrap_validator_staking_pubkey, validator_stake_account_pubkey,
&bootstrap_validator_voting_keypair.pubkey(), &validator_vote_account_keypair.pubkey(),
&bootstrap_validator_vote_account, &validator_vote_account,
&rent, &rent,
bootstrap_validator_stake_lamports, validator_stake_lamports,
); );
let accounts = [ let accounts = [
@ -179,23 +180,19 @@ pub fn create_genesis_config_with_leader_ex(
Account::new(mint_lamports, 0, &system_program::id()), Account::new(mint_lamports, 0, &system_program::id()),
), ),
( (
*bootstrap_validator_pubkey, *validator_pubkey,
Account::new(bootstrap_validator_lamports, 0, &system_program::id()), Account::new(validator_lamports, 0, &system_program::id()),
), ),
( (
bootstrap_validator_voting_keypair.pubkey(), validator_vote_account_keypair.pubkey(),
bootstrap_validator_vote_account, validator_vote_account,
),
(
*bootstrap_validator_staking_pubkey,
bootstrap_validator_stake_account,
), ),
(*validator_stake_account_pubkey, validator_stake_account),
] ]
.iter() .iter()
.cloned() .cloned()
.collect(); .collect();
let fee_rate_governor = FeeRateGovernor::new(0, 0); // most tests can't handle transaction fees
let mut genesis_config = GenesisConfig { let mut genesis_config = GenesisConfig {
accounts, accounts,
fee_rate_governor, fee_rate_governor,
@ -212,7 +209,6 @@ pub fn create_genesis_config_with_leader_ex(
GenesisConfigInfo { GenesisConfigInfo {
genesis_config, genesis_config,
mint_keypair, mint_keypair,
voting_keypair: Keypair::from_bytes(&bootstrap_validator_voting_keypair.to_bytes()) voting_keypair: Keypair::from_bytes(&validator_vote_account_keypair.to_bytes()).unwrap(),
.unwrap(),
} }
} }

174
tokens/src/commands.rs
View File

@ -940,67 +940,60 @@ pub fn test_process_distribute_stake_with_client(client: &RpcClient, sender_keyp
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use solana_client::rpc_client::get_rpc_request_str;
use solana_core::test_validator::TestValidator; use solana_core::test_validator::TestValidator;
use solana_sdk::{ use solana_sdk::{
clock::DEFAULT_MS_PER_SLOT, clock::DEFAULT_MS_PER_SLOT,
signature::{read_keypair_file, write_keypair_file}, signature::{read_keypair_file, write_keypair_file},
}; };
use solana_stake_program::stake_instruction::StakeInstruction; use solana_stake_program::stake_instruction::StakeInstruction;
use std::fs::remove_dir_all;
// This is a quick hack until TestValidator can be initialized with fees from block 0
fn test_validator_block_0_fee_workaround(client: &RpcClient) {
while client
.get_recent_blockhash()
.unwrap()
.1
.lamports_per_signature
== 0
{
sleep(Duration::from_millis(DEFAULT_MS_PER_SLOT));
}
}
#[test] #[test]
fn test_process_token_allocations() { fn test_process_token_allocations() {
let TestValidator { let test_validator = TestValidator::with_no_fees();
server, let alice = test_validator.mint_keypair();
leader_data, let url = test_validator.rpc_url();
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let url = get_rpc_request_str(leader_data.rpc, false);
let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent()); let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent());
test_process_distribute_tokens_with_client(&client, alice, None); test_process_distribute_tokens_with_client(&client, alice, None);
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_process_transfer_amount_allocations() { fn test_process_transfer_amount_allocations() {
let TestValidator { let test_validator = TestValidator::with_no_fees();
server, let alice = test_validator.mint_keypair();
leader_data, let url = test_validator.rpc_url();
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let url = get_rpc_request_str(leader_data.rpc, false);
let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent()); let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent());
test_process_distribute_tokens_with_client(&client, alice, Some(sol_to_lamports(1.5))); test_process_distribute_tokens_with_client(&client, alice, Some(sol_to_lamports(1.5)));
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_process_stake_allocations() { fn test_process_stake_allocations() {
let TestValidator { let test_validator = TestValidator::with_no_fees();
server, let alice = test_validator.mint_keypair();
leader_data, let url = test_validator.rpc_url();
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let url = get_rpc_request_str(leader_data.rpc, false);
let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent()); let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent());
test_process_distribute_stake_with_client(&client, alice); test_process_distribute_stake_with_client(&client, alice);
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
@ -1309,28 +1302,16 @@ mod tests {
fn test_check_payer_balances_distribute_tokens_single_payer() { fn test_check_payer_balances_distribute_tokens_single_payer() {
let fees = 10_000; let fees = 10_000;
let fees_in_sol = lamports_to_sol(fees); let fees_in_sol = lamports_to_sol(fees);
let TestValidator {
server, let test_validator = TestValidator::with_custom_fees(fees);
leader_data, let alice = test_validator.mint_keypair();
alice, let url = test_validator.rpc_url();
ledger_path,
..
} = TestValidator::with_custom_fee(fees);
let url = get_rpc_request_str(leader_data.rpc, false);
let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent()); let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent());
let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey()); let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey());
write_keypair_file(&alice, &sender_keypair_file).unwrap(); write_keypair_file(&alice, &sender_keypair_file).unwrap();
// This is a quick hack until TestValidator can be initialized with fees from block 0 test_validator_block_0_fee_workaround(&client);
while client
.get_recent_blockhash()
.unwrap()
.1
.lamports_per_signature
== 0
{
sleep(Duration::from_millis(DEFAULT_MS_PER_SLOT));
}
let allocation_amount = 1000.0; let allocation_amount = 1000.0;
@ -1402,39 +1383,23 @@ mod tests {
panic!("check_payer_balances should have errored"); panic!("check_payer_balances should have errored");
} }
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_check_payer_balances_distribute_tokens_separate_payers() { fn test_check_payer_balances_distribute_tokens_separate_payers() {
let fees = 10_000; let fees = 10_000;
let fees_in_sol = lamports_to_sol(fees); let fees_in_sol = lamports_to_sol(fees);
let TestValidator { let test_validator = TestValidator::with_custom_fees(fees);
server, let alice = test_validator.mint_keypair();
leader_data, let url = test_validator.rpc_url();
alice,
ledger_path,
..
} = TestValidator::with_custom_fee(fees);
let url = get_rpc_request_str(leader_data.rpc, false);
let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent()); let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent());
test_validator_block_0_fee_workaround(&client);
let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey()); let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey());
write_keypair_file(&alice, &sender_keypair_file).unwrap(); write_keypair_file(&alice, &sender_keypair_file).unwrap();
// This is a quick hack until TestValidator can be initialized with fees from block 0
while client
.get_recent_blockhash()
.unwrap()
.1
.lamports_per_signature
== 0
{
sleep(Duration::from_millis(DEFAULT_MS_PER_SLOT));
}
let allocation_amount = 1000.0; let allocation_amount = 1000.0;
let funded_payer = Keypair::new(); let funded_payer = Keypair::new();
@ -1491,9 +1456,7 @@ mod tests {
panic!("check_payer_balances should have errored"); panic!("check_payer_balances should have errored");
} }
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
fn initialize_stake_account( fn initialize_stake_account(
@ -1540,30 +1503,15 @@ mod tests {
fn test_check_payer_balances_distribute_stakes_single_payer() { fn test_check_payer_balances_distribute_stakes_single_payer() {
let fees = 10_000; let fees = 10_000;
let fees_in_sol = lamports_to_sol(fees); let fees_in_sol = lamports_to_sol(fees);
let TestValidator { let test_validator = TestValidator::with_custom_fees(fees);
server, let alice = test_validator.mint_keypair();
leader_data, let url = test_validator.rpc_url();
alice,
ledger_path,
..
} = TestValidator::with_custom_fee(fees);
let url = get_rpc_request_str(leader_data.rpc, false);
let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent()); let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent());
test_validator_block_0_fee_workaround(&client);
let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey()); let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey());
write_keypair_file(&alice, &sender_keypair_file).unwrap(); write_keypair_file(&alice, &sender_keypair_file).unwrap();
// This is a quick hack until TestValidator can be initialized with fees from block 0
while client
.get_recent_blockhash()
.unwrap()
.1
.lamports_per_signature
== 0
{
sleep(Duration::from_millis(DEFAULT_MS_PER_SLOT));
}
let allocation_amount = 1000.0; let allocation_amount = 1000.0;
let unlocked_sol = 1.0; let unlocked_sol = 1.0;
let stake_args = initialize_stake_account( let stake_args = initialize_stake_account(
@ -1657,39 +1605,23 @@ mod tests {
panic!("check_payer_balances should have errored"); panic!("check_payer_balances should have errored");
} }
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
#[test] #[test]
fn test_check_payer_balances_distribute_stakes_separate_payers() { fn test_check_payer_balances_distribute_stakes_separate_payers() {
let fees = 10_000; let fees = 10_000;
let fees_in_sol = lamports_to_sol(fees); let fees_in_sol = lamports_to_sol(fees);
let TestValidator { let test_validator = TestValidator::with_custom_fees(fees);
server, let alice = test_validator.mint_keypair();
leader_data, let url = test_validator.rpc_url();
alice,
ledger_path,
..
} = TestValidator::with_custom_fee(fees);
let url = get_rpc_request_str(leader_data.rpc, false);
let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent()); let client = RpcClient::new_with_commitment(url, CommitmentConfig::recent());
test_validator_block_0_fee_workaround(&client);
let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey()); let sender_keypair_file = tmp_file_path("keypair_file", &alice.pubkey());
write_keypair_file(&alice, &sender_keypair_file).unwrap(); write_keypair_file(&alice, &sender_keypair_file).unwrap();
// This is a quick hack until TestValidator can be initialized with fees from block 0
while client
.get_recent_blockhash()
.unwrap()
.1
.lamports_per_signature
== 0
{
sleep(Duration::from_millis(DEFAULT_MS_PER_SLOT));
}
let allocation_amount = 1000.0; let allocation_amount = 1000.0;
let unlocked_sol = 1.0; let unlocked_sol = 1.0;
let stake_args = initialize_stake_account( let stake_args = initialize_stake_account(
@ -1753,8 +1685,6 @@ mod tests {
panic!("check_payer_balances should have errored"); panic!("check_payer_balances should have errored");
} }
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker test_validator.close();
server.close().unwrap();
remove_dir_all(ledger_path).unwrap();
} }
} }

18
tokens/tests/commands.rs
View File

@ -1,23 +1,15 @@
use solana_client::rpc_client::RpcClient; use solana_client::rpc_client::RpcClient;
use solana_core::test_validator::TestValidator; use solana_core::test_validator::TestValidator;
use solana_tokens::commands::test_process_distribute_tokens_with_client; use solana_tokens::commands::test_process_distribute_tokens_with_client;
use std::fs::remove_dir_all;
#[test] #[test]
fn test_process_distribute_with_rpc_client() { fn test_process_distribute_with_rpc_client() {
solana_logger::setup(); solana_logger::setup();
let TestValidator {
server,
leader_data,
alice,
ledger_path,
..
} = TestValidator::with_no_fee();
let client = RpcClient::new_socket(leader_data.rpc); let test_validator = TestValidator::with_no_fees();
test_process_distribute_tokens_with_client(&client, alice, None);
// Explicit cleanup, otherwise "pure virtual method called" crash in Docker let client = RpcClient::new(test_validator.rpc_url());
server.close().unwrap(); test_process_distribute_tokens_with_client(&client, test_validator.mint_keypair(), None);
remove_dir_all(ledger_path).unwrap();
test_validator.close();
} }