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

fix: remove unnecessary --allow-private-addr setup (#30552)

This commit is contained in:
Yihau Chen 2023-02-28 13:14:44 +08:00 committed by GitHub
parent 781a7cbd28
commit 676e3e1926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/common.sh
View File

@ -69,7 +69,6 @@ loadConfigFile() {
entrypointIp=${validatorIpList[0]} entrypointIp=${validatorIpList[0]}
else else
entrypointIp=${validatorIpListPrivate[0]} entrypointIp=${validatorIpListPrivate[0]}
maybeAllowPrivateAddr='--allow-private-addr'
fi fi
buildSshOptions buildSshOptions

9
net/net.sh
View File

@ -323,7 +323,7 @@ startBootstrapLeader() {
$nodeIndex \ $nodeIndex \
${#clientIpList[@]} \"$benchTpsExtraArgs\" \ ${#clientIpList[@]} \"$benchTpsExtraArgs\" \
\"$genesisOptions\" \ \"$genesisOptions\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \ \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \ \"$gpuMode\" \
\"$maybeWarpSlot\" \ \"$maybeWarpSlot\" \
\"$maybeFullRpc\" \ \"$maybeFullRpc\" \
@ -397,7 +397,7 @@ startNode() {
$nodeIndex \ $nodeIndex \
${#clientIpList[@]} \"$benchTpsExtraArgs\" \ ${#clientIpList[@]} \"$benchTpsExtraArgs\" \
\"$genesisOptions\" \ \"$genesisOptions\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \ \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \ \"$gpuMode\" \
\"$maybeWarpSlot\" \ \"$maybeWarpSlot\" \
\"$maybeFullRpc\" \ \"$maybeFullRpc\" \
@ -797,7 +797,6 @@ maybeLimitLedgerSize=""
maybeSkipLedgerVerify="" maybeSkipLedgerVerify=""
maybeDisableAirdrops="" maybeDisableAirdrops=""
maybeWaitForSupermajority="" maybeWaitForSupermajority=""
maybeAllowPrivateAddr=""
maybeAccountsDbSkipShrink="" maybeAccountsDbSkipShrink=""
maybeSkipRequireTower="" maybeSkipRequireTower=""
debugBuild=false debugBuild=false
@ -942,9 +941,7 @@ while [[ -n $1 ]]; do
extraPrimordialStakes=$2 extraPrimordialStakes=$2
shift 2 shift 2
elif [[ $1 = --allow-private-addr ]]; then elif [[ $1 = --allow-private-addr ]]; then
# May also be added by loadConfigFile if 'gce.sh create' was invoked echo "--allow-private-addr is a default value"
# without -P.
maybeAllowPrivateAddr="$1"
shift 1 shift 1
elif [[ $1 = --accounts-db-skip-shrink ]]; then elif [[ $1 = --accounts-db-skip-shrink ]]; then
maybeAccountsDbSkipShrink="$1" maybeAccountsDbSkipShrink="$1"

7
system-test/testnet-automation.sh
View File

@ -136,11 +136,6 @@ function launch_testnet() {
maybeAsyncNodeInit="--async-node-init" maybeAsyncNodeInit="--async-node-init"
fi fi
declare maybeAllowPrivateAddr
if [[ "$ALLOW_PRIVATE_ADDR" = "true" ]]; then
maybeAllowPrivateAddr="--allow-private-addr"
fi
declare maybeExtraPrimordialStakes declare maybeExtraPrimordialStakes
if [[ -n "$EXTRA_PRIMORDIAL_STAKES" ]]; then if [[ -n "$EXTRA_PRIMORDIAL_STAKES" ]]; then
maybeExtraPrimordialStakes="--extra-primordial-stakes $EXTRA_PRIMORDIAL_STAKES" maybeExtraPrimordialStakes="--extra-primordial-stakes $EXTRA_PRIMORDIAL_STAKES"
@ -151,7 +146,7 @@ function launch_testnet() {
"${REPO_ROOT}"/net/net.sh start $version_args \ "${REPO_ROOT}"/net/net.sh start $version_args \
-c idle=$NUMBER_OF_CLIENT_NODES $maybeStartAllowBootFailures \ -c idle=$NUMBER_OF_CLIENT_NODES $maybeStartAllowBootFailures \
--gpu-mode $startGpuMode $maybeWarpSlot $maybeAsyncNodeInit \ --gpu-mode $startGpuMode $maybeWarpSlot $maybeAsyncNodeInit \
$maybeExtraPrimordialStakes $maybeAllowPrivateAddr $maybeExtraPrimordialStakes
if [[ -n "$WAIT_FOR_EQUAL_STAKE" ]]; then if [[ -n "$WAIT_FOR_EQUAL_STAKE" ]]; then
wait_for_equal_stake wait_for_equal_stake