Remove bench-tps converge-only

bench-tps/src/bench.rs

@@ -51,8 +51,6 @@ pub fn do_bench_tps(config: Config) {
         duration,
         tx_count,
         sustained,
-        reject_extra_nodes,
-        converge_only,
     } = config;
 
     let nodes = discover_nodes(&network, num_nodes).unwrap_or_else(|err| {
@@ -66,17 +64,6 @@ pub fn do_bench_tps(config: Config) {
         );
         exit(1);
     }
-    if reject_extra_nodes && nodes.len() > num_nodes {
-        eprintln!(
-            "Error: Extra nodes discovered.  Expecting exactly {}",
-            num_nodes
-        );
-        exit(1);
-    }
-
-    if converge_only {
-        return;
-    }
     let cluster_entrypoint = nodes[0].clone(); // Pick the first node, why not?
 
     let client = create_client(cluster_entrypoint.client_facing_addr(), FULLNODE_PORT_RANGE);

bench-tps/src/cli.rs

@@ -17,8 +17,6 @@ pub struct Config {
     pub tx_count: usize,
     pub thread_batch_sleep_ms: usize,
     pub sustained: bool,
-    pub reject_extra_nodes: bool,
-    pub converge_only: bool,
 }
 
 impl Default for Config {
@@ -33,8 +31,6 @@ impl Default for Config {
             tx_count: 500_000,
             thread_batch_sleep_ms: 0,
             sustained: false,
-            reject_extra_nodes: false,
-            converge_only: false,
         }
     }
 }
@@ -75,11 +71,6 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
                 .takes_value(true)
                 .help("Wait for NUM nodes to converge"),
         )
-        .arg(
-            Arg::with_name("reject-extra-nodes")
-                .long("reject-extra-nodes")
-                .help("Require exactly `num-nodes` on convergence. Appropriate only for internal networks"),
-        )
         .arg(
             Arg::with_name("threads")
                 .short("t")
@@ -95,11 +86,6 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
                 .takes_value(true)
                 .help("Seconds to run benchmark, then exit; default is forever"),
         )
-        .arg(
-            Arg::with_name("converge-only")
-                .long("converge-only")
-                .help("Exit immediately after converging"),
-        )
         .arg(
             Arg::with_name("sustained")
                 .long("sustained")
@@ -176,8 +162,6 @@ pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
     }
 
     args.sustained = matches.is_present("sustained");
-    args.converge_only = matches.is_present("converge-only");
-    args.reject_extra_nodes = matches.is_present("reject-extra-nodes");
 
     args
 }

book/src/testnet-participation.md

@@ -73,7 +73,7 @@ Inspect the blockexplorer at http://beta.testnet.solana.com/ for activity.
 
 Run the following command to join the gossip network and view all the other nodes in the cluster:
 ```bash
-$ RUST_LOG=info solana-bench-tps --converge-only --num-nodes 100000 --network ${ip:?}:8001
+$ RUST_LOG=info solana-gossip --network ${ip:?}:8001
 ```
 
 #### Starting The Validator
@@ -85,7 +85,7 @@ $ RUST_LOG=warn ./multinode-demo/fullnode-x.sh --public-address --poll-for-new-g
 Then from another console, confirm the IP address if your node is now visible in
 the gossip network by running:
 ```bash
-$ RUST_LOG=info solana-bench-tps --converge-only --num-nodes 100000 --network ${ip:?}:8001
+$ RUST_LOG=info solana-gossip --network ${ip:?}:8001
 ```
 
 Congratulations, you're now participating in the testnet cluster!
@@ -102,7 +102,7 @@ source scripts/configure-metrics.sh
 Inspect for your contributions to our [metrics dashboard](https://metrics.solana.com:3000/d/U9-26Cqmk/testnet-monitor-cloud?refresh=60s&orgId=2&var-hostid=All).
 
 #### Metrics Server Maintenance
-Sometimes the dashboard becomes unresponsive. This happens due to glitch in the metrics server. 
+Sometimes the dashboard becomes unresponsive. This happens due to glitch in the metrics server.
 The current solution is to reset the metrics server. Use the following steps.
 
 1. The server is hosted in a GCP VM instance. Check if the VM instance is down by trying to SSH
@@ -139,4 +139,4 @@ Check the following if there are any signs of failure.
     3. Copy the relevant private key to your local machine
     4. Find the public IP address of the AWS instance for the remote node using AWS console
     5. ```ssh -i <private key file> ubuntu@<ip address of remote node>```
-    6. The logs are in ```~solana\solana``` folder
+    6. The logs are in ```~solana\solana``` folder

ci/localnet-sanity.sh

@@ -307,11 +307,8 @@ while [[ $iteration -le $iterations ]]; do
     set -x
     client_id=/tmp/client-id.json-$$
     $solana_keygen -o $client_id || exit $?
-    $solana_bench_tps \
-      --identity $client_id \
-      --num-nodes $numNodes \
-      --reject-extra-nodes \
-      --converge-only || exit $?
+    $solana_gossip \
+      --num-nodes-exactly $numNodes || exit $?
     rm -rf $client_id
   ) || flag_error
 

multinode-demo/common.sh

@@ -59,13 +59,14 @@ else
 fi
 
 solana_bench_tps=$(solana_program bench-tps)
-solana_wallet=$(solana_program wallet)
 solana_drone=$(solana_program drone)
 solana_fullnode=$(solana_program fullnode)
 solana_fullnode_cuda=$(solana_program fullnode-cuda)
 solana_genesis=$(solana_program genesis)
+solana_gossip=$(solana_program gossip)
 solana_keygen=$(solana_program keygen)
 solana_ledger_tool=$(solana_program ledger-tool)
+solana_wallet=$(solana_program wallet)
 
 export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
 export RUST_BACKTRACE=1

net/remote/remote-sanity.sh

@@ -67,7 +67,7 @@ local|tar)
 
   entrypointRsyncUrl="$entrypointIp:~/solana"
 
-  solana_bench_tps=solana-bench-tps
+  solana_gossip=solana-gossip
   solana_ledger_tool=solana-ledger-tool
   solana_keygen=solana-keygen
 
@@ -84,18 +84,14 @@ echo "+++ $entrypointIp: node count ($numNodes expected)"
   set -x
   $solana_keygen -o "$client_id"
 
-  maybeRejectExtraNodes=
+  nodeArg="--num-nodes"
   if $rejectExtraNodes; then
-    maybeRejectExtraNodes="--reject-extra-nodes"
+    nodeArg="--num-nodes-exactly"
   fi
 
-  timeout 2m $solana_bench_tps \
+  timeout 2m $solana_gossip \
     --network "$entrypointIp:8001" \
-    --drone "$entrypointIp:9900" \
-    --identity "$client_id" \
-    --num-nodes "$numNodes" \
-    $maybeRejectExtraNodes \
-    --converge-only
+    --$nodeArg "$numNodes" \
 )
 
 echo "--- RPC API: getTransactionCount"