bench-tps/net sanity: add ability to check for unexpected extra nodes

ci/localnet-sanity.sh

@@ -73,7 +73,7 @@ echo "--- Node count"
   set -x
   client_id=/tmp/client-id.json-$$
   $solana_keygen -o $client_id
-  $solana_bench_tps --identity $client_id --num-nodes 3 --converge-only
+  $solana_bench_tps --identity $client_id --num-nodes 3 --reject-extra-nodes --converge-only
   rm -rf $client_id
 ) || flag_error
 

ci/testnet-deploy.sh

@@ -108,6 +108,11 @@ time net/gce.sh create "${gce_create_args[@]}"
 net/init-metrics.sh -e
 
 echo --- net.sh start
-time net/net.sh start -s "$snapChannel"
+maybeRejectExtraNodes=
+if ! $publicNetwork; then
+  maybeRejectExtraNodes="-o rejectExtraNodes"
+fi
+# shellcheck disable=SC2086 # Don't want to double quote maybeRejectExtraNodes
+time net/net.sh start -s "$snapChannel" $maybeRejectExtraNodes
 
 exit 0

ci/testnet-sanity.sh

@@ -32,5 +32,6 @@ echo --- net.sh sanity
 net/net.sh sanity \
   ${NO_LEDGER_VERIFY:+-o noLedgerVerify} \
   ${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
+  ${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
 
 exit 0