fix: remove unnecessary --allow-private-addr setup (#30552)
This commit is contained in:
parent
781a7cbd28
commit
676e3e1926
|
@ -69,7 +69,6 @@ loadConfigFile() {
|
|||
entrypointIp=${validatorIpList[0]}
|
||||
else
|
||||
entrypointIp=${validatorIpListPrivate[0]}
|
||||
maybeAllowPrivateAddr='--allow-private-addr'
|
||||
fi
|
||||
|
||||
buildSshOptions
|
||||
|
|
|
@ -323,7 +323,7 @@ startBootstrapLeader() {
|
|||
$nodeIndex \
|
||||
${#clientIpList[@]} \"$benchTpsExtraArgs\" \
|
||||
\"$genesisOptions\" \
|
||||
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
|
||||
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
|
||||
\"$gpuMode\" \
|
||||
\"$maybeWarpSlot\" \
|
||||
\"$maybeFullRpc\" \
|
||||
|
@ -397,7 +397,7 @@ startNode() {
|
|||
$nodeIndex \
|
||||
${#clientIpList[@]} \"$benchTpsExtraArgs\" \
|
||||
\"$genesisOptions\" \
|
||||
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
|
||||
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
|
||||
\"$gpuMode\" \
|
||||
\"$maybeWarpSlot\" \
|
||||
\"$maybeFullRpc\" \
|
||||
|
@ -797,7 +797,6 @@ maybeLimitLedgerSize=""
|
|||
maybeSkipLedgerVerify=""
|
||||
maybeDisableAirdrops=""
|
||||
maybeWaitForSupermajority=""
|
||||
maybeAllowPrivateAddr=""
|
||||
maybeAccountsDbSkipShrink=""
|
||||
maybeSkipRequireTower=""
|
||||
debugBuild=false
|
||||
|
@ -942,9 +941,7 @@ while [[ -n $1 ]]; do
|
|||
extraPrimordialStakes=$2
|
||||
shift 2
|
||||
elif [[ $1 = --allow-private-addr ]]; then
|
||||
# May also be added by loadConfigFile if 'gce.sh create' was invoked
|
||||
# without -P.
|
||||
maybeAllowPrivateAddr="$1"
|
||||
echo "--allow-private-addr is a default value"
|
||||
shift 1
|
||||
elif [[ $1 = --accounts-db-skip-shrink ]]; then
|
||||
maybeAccountsDbSkipShrink="$1"
|
||||
|
|
|
@ -136,11 +136,6 @@ function launch_testnet() {
|
|||
maybeAsyncNodeInit="--async-node-init"
|
||||
fi
|
||||
|
||||
declare maybeAllowPrivateAddr
|
||||
if [[ "$ALLOW_PRIVATE_ADDR" = "true" ]]; then
|
||||
maybeAllowPrivateAddr="--allow-private-addr"
|
||||
fi
|
||||
|
||||
declare maybeExtraPrimordialStakes
|
||||
if [[ -n "$EXTRA_PRIMORDIAL_STAKES" ]]; then
|
||||
maybeExtraPrimordialStakes="--extra-primordial-stakes $EXTRA_PRIMORDIAL_STAKES"
|
||||
|
@ -151,7 +146,7 @@ function launch_testnet() {
|
|||
"${REPO_ROOT}"/net/net.sh start $version_args \
|
||||
-c idle=$NUMBER_OF_CLIENT_NODES $maybeStartAllowBootFailures \
|
||||
--gpu-mode $startGpuMode $maybeWarpSlot $maybeAsyncNodeInit \
|
||||
$maybeExtraPrimordialStakes $maybeAllowPrivateAddr
|
||||
$maybeExtraPrimordialStakes
|
||||
|
||||
if [[ -n "$WAIT_FOR_EQUAL_STAKE" ]]; then
|
||||
wait_for_equal_stake
|
||||
|
|
Loading…
Reference in New Issue