rework of netwrk rendezvous

* rename NodeInfo field of Node from "data" to "info"
      (touches a lot of files)

  * update client to use gossip to find leader, a la drone

  * rework multinode scripts
      * move more stuff into rust
      * added usage to all
      * no more rsync unless you're a validator (TODO: whack that, too)
  * fullnode doesn't bail if drone isn't up yet, just keeps trying
  * drone doesn't bail if network isn't up yet, just keeps trying

multinode-demo/client.sh

@@ -1,68 +1,37 @@
 #!/bin/bash -e
-#
-USAGE=" usage: $0 [leader_url] [num_nodes] [--loop] [extra args]
-
- Run bench-tps against the specified network
-
- leader_url       URL to the leader (defaults to ..)
- num_nodes        Minimum number of nodes to look for while converging
- --loop           Add this flag to cause the program to loop infinitely
- \"extra args\"     Any additional arguments are pass along to solana-bench-tps
-"
 
 here=$(dirname "$0")
 # shellcheck source=multinode-demo/common.sh
 source "$here"/common.sh
 
-leader=$1
-if [[ -n $leader ]]; then
-  if [[ $leader == "-h" || $leader == "--help" ]]; then
-    echo "$USAGE"
-    exit 0
+usage() {
+  if [[ -n $1 ]]; then
+    echo "$*"
+    echo
   fi
-  shift
+  echo "usage: $0 [network entry point] [extra args]"
+  echo
+  echo " Run bench-tps against the specified network"
+  echo
+  echo "   extra args: additional arguments are pass along to solana-bench-tps"
+  echo
+  exit 1
+}
+
+# this is a little hacky
+if [[ ${1:0:2} != "--" ]]; then
+    read -r _ leader_address shift < <(find_leader "${@:1:1}")
 else
-  if [[ -d "$SNAP" ]]; then
-    leader=testnet.solana.com # Default to testnet when running as a Snap
-  else
-    leader=$here/.. # Default to local solana repo
-  fi
+    read -r _ leader_address shift < <(find_leader)
 fi
+shift "$shift"
 
-count=$1
-if [[ -n $count ]]; then
-  shift
-else
-  count=1
-fi
 
-loop=
-if [[ $1 = --loop ]]; then
-  loop=1
-  shift
-fi
+client_json="$SOLANA_CONFIG_CLIENT_DIR"/client.json
+[[ -r $client_json ]] || $solana_keygen -o "$client_json"
 
-rsync_leader_url=$(rsync_url "$leader")
-(
-  set -x
-  mkdir -p "$SOLANA_CONFIG_CLIENT_DIR"
-  $rsync -vPz "$rsync_leader_url"/config/leader.json "$SOLANA_CONFIG_CLIENT_DIR"/
-
-  client_json="$SOLANA_CONFIG_CLIENT_DIR"/client.json
-  [[ -r $client_json ]] || $solana_keygen -o "$client_json"
-)
-
-iteration=0
 set -x
-while true; do
-    $solana_bench_tps \
-      -n "$count" \
-      -l "$SOLANA_CONFIG_CLIENT_DIR"/leader.json \
-      -k "$SOLANA_CONFIG_CLIENT_DIR"/client.json \
-      "$@"
-  [[ -n $loop ]] || exit 0
-  iteration=$((iteration + 1))
-  echo ------------------------------------------------------------------------
-  echo "Iteration: $iteration"
-  echo ------------------------------------------------------------------------
-done
+$solana_bench_tps \
+    --network "$leader_address" \
+    --keypair "$SOLANA_CONFIG_CLIENT_DIR"/client.json \
+    "$@"