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

passes through --allow-private-addr to validators in system perf tests (backport #18876) (#20180)

Browse Source 
* passes through --allow-private-addr to validators in system perf tests (#18876)

(cherry picked from commit 81026f9ea5)

# Conflicts:
#	multinode-demo/bootstrap-validator.sh
#	multinode-demo/validator.sh
#	net/net.sh

* removes backport merge conflicts

* ignores RUSTSEC-2021-0115

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
This commit is contained in:
mergify[bot]
2021-09-25 20:08:32 +00:00
committed by GitHub
parent 302887da67
commit e50a26a493
8 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
multinode-demo/bootstrap-validator.sh
View File

@@ -79,6 +79,9 @@ while [[ -n $1 ]]; do
elif [[ $1 == --accounts-db-skip-shrink ]]; then
args+=("$1")
shift
elif [[ $1 == --allow-private-addr ]]; then
args+=("$1")
shift
elif [[ $1 == --skip-require-tower ]]; then
maybeRequireTower=false
shift

8
multinode-demo/validator.sh
View File

@@ -18,6 +18,7 @@ vote_account=
no_restart=0
gossip_entrypoint=
ledger_dir=
maybe_allow_private_addr=
usage() {
if [[ -n $1 ]]; then
@@ -160,6 +161,10 @@ while [[ -n $1 ]]; do
elif [[ $1 == --expected-bank-hash ]]; then
args+=("$1" "$2")
shift 2
elif [[ $1 == --allow-private-addr ]]; then
args+=("$1")
maybe_allow_private_addr=$1
shift
elif [[ $1 == --accounts-db-skip-shrink ]]; then
args+=("$1")
shift
@@ -312,7 +317,8 @@ setup_validator_accounts() {
return 0
}
rpc_url=$($solana_gossip rpc-url --timeout 180 --entrypoint "$gossip_entrypoint")
# shellcheck disable=SC2086 # Don't want to double quote "$maybe_allow_private_addr"
rpc_url=$($solana_gossip $maybe_allow_private_addr rpc-url --timeout 180 --entrypoint "$gossip_entrypoint")
[[ -r "$identity" ]] || $solana_keygen new --no-passphrase -so "$identity"
[[ -r "$vote_account" ]] || $solana_keygen new --no-passphrase -so "$vote_account"