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

test-validator: Hint at airdrop when wallet is unavailable

This commit is contained in:
Trent Nelson 2021-05-14 01:56:03 -06:00 committed by Trent Nelson
parent 5e642a174c
commit 2c8dde7224
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
validator/src/bin/solana-test-validator.rs
View File

@ -22,7 +22,8 @@ use {
system_program, system_program,
}, },
solana_validator::{ solana_validator::{
admin_rpc_service, dashboard::Dashboard, redirect_stderr_to_file, test_validator::*, admin_rpc_service, dashboard::Dashboard, println_name_value, redirect_stderr_to_file,
test_validator::*,
}, },
std::{ std::{
collections::HashSet, collections::HashSet,
@ -275,10 +276,12 @@ fn main() {
.map(normalize_to_url_if_moniker) .map(normalize_to_url_if_moniker)
.map(RpcClient::new); .map(RpcClient::new);
let mint_address = pubkey_of(&matches, "mint_address").unwrap_or_else(|| { let (mint_address, random_mint) = pubkey_of(&matches, "mint_address")
.map(|pk| (pk, false))
.unwrap_or_else(|| {
read_keypair_file(&cli_config.keypair_path) read_keypair_file(&cli_config.keypair_path)
.unwrap_or_else(|_| Keypair::new()) .map(|kp| (kp.pubkey(), false))
.pubkey() .unwrap_or_else(|_| (Keypair::new().pubkey(), true))
}); });
let ledger_path = value_t_or_exit!(matches, "ledger_path", PathBuf); let ledger_path = value_t_or_exit!(matches, "ledger_path", PathBuf);
@ -472,6 +475,11 @@ fn main() {
println!("{} argument ignored, ledger already exists", long); println!("{} argument ignored, ledger already exists", long);
} }
} }
} else if random_mint {
println_name_value(
"\nNotice!",
"No wallet available. `solana airdrop` localnet SOL after creating one\n",
);
} }
let mut genesis = TestValidatorGenesis::default(); let mut genesis = TestValidatorGenesis::default();