From 20ad3005b55e32e2cabedde2dedf7bcaec9f307c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 30 Jul 2021 00:05:19 +0000 Subject: [PATCH] allows private addresses by default in test-validator (backport #18976) (#18980) * allows private addresses by default in test-validator (#18976) (cherry picked from commit 1cef6fd4b44a82920b2706ecddd106dd32426ffa) # Conflicts: # validator/src/bin/solana-test-validator.rs * removes backport merge conflicts Co-authored-by: behzad nouri --- validator/src/bin/solana-test-validator.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs index c37ff3bd8b..992eaec10b 100644 --- a/validator/src/bin/solana-test-validator.rs +++ b/validator/src/bin/solana-test-validator.rs @@ -280,16 +280,10 @@ fn main() { If the ledger already exists then this parameter is silently ignored", ), ) - .arg( - Arg::with_name("allow_private_addr") - .long("allow-private-addr") - .takes_value(false) - .help("Allow contacting private ip addresses") - .hidden(true), - ) .get_matches(); - let socket_addr_space = SocketAddrSpace::new(matches.is_present("allow_private_addr")); + // TODO: Ideally test-validator should *only* allow private addresses. + let socket_addr_space = SocketAddrSpace::new(/*allow_private_addr=*/ true); let cli_config = if let Some(config_file) = matches.value_of("config_file") { solana_cli_config::Config::load(config_file).unwrap_or_default() } else {