Skip to content

Commit

Permalink
Revert "Enable easy full-rpc services on testnet nodes (solana-labs#2…
Browse files Browse the repository at this point in the history
…0529)"

This reverts commit 164d551.
  • Loading branch information
frits-metalogix authored Nov 24, 2021
1 parent ea622d4 commit 3caae5a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 22 deletions.
8 changes: 0 additions & 8 deletions net/net.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ Operate a configured testnet
- Override the number of slots in an epoch
--warp-slot WARP_SLOT
- Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis.
--full-rpc
- Support full RPC services on all nodes
sanity/start-specific options:
-F - Discard validator nodes that didn't bootup successfully
-o noInstallCheck - Skip solana-install sanity
Expand Down Expand Up @@ -312,7 +310,6 @@ startBootstrapLeader() {
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \
\"$maybeWarpSlot\" \
\"$maybeFullRpc\" \
\"$waitForNodeInit\" \
\"$extraPrimordialStakes\" \
\"$TMPFS_ACCOUNTS\" \
Expand Down Expand Up @@ -384,7 +381,6 @@ startNode() {
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \
\"$maybeWarpSlot\" \
\"$maybeFullRpc\" \
\"$waitForNodeInit\" \
\"$extraPrimordialStakes\" \
\"$TMPFS_ACCOUNTS\" \
Expand Down Expand Up @@ -792,7 +788,6 @@ netemCommand="add"
clientDelayStart=0
netLogDir=
maybeWarpSlot=
maybeFullRpc=false
waitForNodeInit=true
extraPrimordialStakes=0

Expand Down Expand Up @@ -901,9 +896,6 @@ while [[ -n $1 ]]; do
elif [[ $1 == --warp-slot ]]; then
maybeWarpSlot="$1 $2"
shift 2
elif [[ $1 == --full-rpc ]]; then
maybeFullRpc=true
shift 1
elif [[ $1 == --async-node-init ]]; then
waitForNodeInit=false
shift 1
Expand Down
17 changes: 3 additions & 14 deletions net/remote/remote-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ genesisOptions="${15}"
extraNodeArgs="${16}"
gpuMode="${17:-auto}"
maybeWarpSlot="${18}"
maybeFullRpc="${19}"
waitForNodeInit="${20}"
extraPrimordialStakes="${21:=0}"
tmpfsAccounts="${22:false}"
waitForNodeInit="${19}"
extraPrimordialStakes="${20:=0}"
tmpfsAccounts="${21:false}"
set +x

missing() {
Expand Down Expand Up @@ -278,11 +277,6 @@ EOF
args+=(--accounts /mnt/solana-accounts)
fi

if $maybeFullRpc; then
args+=(--enable-rpc-transaction-history)
args+=(--enable-cpi-and-log-storage)
fi

if [[ $airdropsEnabled = true ]]; then
cat >> ~/solana/on-reboot <<EOF
./multinode-demo/faucet.sh > faucet.log 2>&1 &
Expand Down Expand Up @@ -406,11 +400,6 @@ EOF
args+=(--accounts /mnt/solana-accounts)
fi

if $maybeFullRpc; then
args+=(--enable-rpc-transaction-history)
args+=(--enable-cpi-and-log-storage)
fi

cat >> ~/solana/on-reboot <<EOF
$maybeSkipAccountsCreation
nohup multinode-demo/validator.sh ${args[@]} > validator.log.\$now 2>&1 &
Expand Down

0 comments on commit 3caae5a

Please sign in to comment.