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

test-validator: add an arg to control faucet genesis balance (#17581)

Browse Source 
(cherry picked from commit 974a96738a)

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2021-05-28 10:43:31 -07:00
committed by GitHub
parent 01e2d5cd35
commit 8b1a1d9c99
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,8 @@ use {
*/ */
const DEFAULT_MAX_LEDGER_SHREDS: u64 = 10_000; const DEFAULT_MAX_LEDGER_SHREDS: u64 = 10_000;
const DEFAULT_FAUCET_SOL: f64 = 1_000_000.;
#[derive(PartialEq)] #[derive(PartialEq)]
enum Output { enum Output {
None, None,
@ -53,6 +55,7 @@ fn main() {
let default_rpc_port = rpc_port::DEFAULT_RPC_PORT.to_string(); let default_rpc_port = rpc_port::DEFAULT_RPC_PORT.to_string();
let default_faucet_port = FAUCET_PORT.to_string(); let default_faucet_port = FAUCET_PORT.to_string();
let default_limit_ledger_size = DEFAULT_MAX_LEDGER_SHREDS.to_string(); let default_limit_ledger_size = DEFAULT_MAX_LEDGER_SHREDS.to_string();
let default_faucet_sol = DEFAULT_FAUCET_SOL.to_string();
let matches = App::new("solana-test-validator") let matches = App::new("solana-test-validator")
.about("Test Validator") .about("Test Validator")
@ -264,6 +267,17 @@ fn main() {
.default_value(default_limit_ledger_size.as_str()) .default_value(default_limit_ledger_size.as_str())
.help("Keep this amount of shreds in root slots."), .help("Keep this amount of shreds in root slots."),
) )
.arg(
Arg::with_name("faucet_sol")
.long("faucet-sol")
.takes_value(true)
.value_name("SOL")
.default_value(default_faucet_sol.as_str())
.help(
"Give the faucet address this much SOL in genesis. \
If the ledger already exists then this parameter is silently ignored",
),
)
.get_matches(); .get_matches();
let cli_config = if let Some(config_file) = matches.value_of("config_file") { let cli_config = if let Some(config_file) = matches.value_of("config_file") {
@ -429,7 +443,7 @@ fn main() {
}; };
let _logger_thread = redirect_stderr_to_file(logfile); let _logger_thread = redirect_stderr_to_file(logfile);
let faucet_lamports = sol_to_lamports(1_000_000.); let faucet_lamports = sol_to_lamports(value_of(&matches, "faucet_sol").unwrap());
let faucet_keypair_file = ledger_path.join("faucet-keypair.json"); let faucet_keypair_file = ledger_path.join("faucet-keypair.json");
if !faucet_keypair_file.exists() { if !faucet_keypair_file.exists() {
write_keypair_file(&Keypair::new(), faucet_keypair_file.to_str().unwrap()).unwrap_or_else( write_keypair_file(&Keypair::new(), faucet_keypair_file.to_str().unwrap()).unwrap_or_else(
@ -470,6 +484,7 @@ fn main() {
("clone_account", "--clone"), ("clone_account", "--clone"),
("mint_address", "--mint"), ("mint_address", "--mint"),
("slots_per_epoch", "--slots-per-epoch"), ("slots_per_epoch", "--slots-per-epoch"),
("faucet_sol", "--faucet-sol"),
] { ] {
if matches.is_present(name) { if matches.is_present(name) {
println!("{} argument ignored, ledger already exists", long); println!("{} argument ignored, ledger already exists", long);