From 3caae5a86607ab5154b9d9773790d220e1cec7d7 Mon Sep 17 00:00:00 2001
From: frits-double-eye <31902851+frits-double-eye@users.noreply.github.com>
Date: Wed, 24 Nov 2021 14:39:20 +0200
Subject: [PATCH] Revert "Enable easy full-rpc services on testnet nodes
 (#20529)"

This reverts commit 164d5513f452b9140fd533f8e7b024f077451bc9.
---
 net/net.sh                |  8 --------
 net/remote/remote-node.sh | 17 +++--------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/net/net.sh b/net/net.sh
index 8a04a362ccb8ef..d531d4569ef322 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -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
@@ -312,7 +310,6 @@ startBootstrapLeader() {
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
-         \"$maybeFullRpc\" \
          \"$waitForNodeInit\" \
          \"$extraPrimordialStakes\" \
          \"$TMPFS_ACCOUNTS\" \
@@ -384,7 +381,6 @@ startNode() {
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
-         \"$maybeFullRpc\" \
          \"$waitForNodeInit\" \
          \"$extraPrimordialStakes\" \
          \"$TMPFS_ACCOUNTS\" \
@@ -792,7 +788,6 @@ netemCommand="add"
 clientDelayStart=0
 netLogDir=
 maybeWarpSlot=
-maybeFullRpc=false
 waitForNodeInit=true
 extraPrimordialStakes=0
 
@@ -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
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index eedb35672da107..18958a87803c3a 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -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() {
@@ -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 &
@@ -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 &