From 1144190d8dbad8f72451f24b221ab63ea244db2e Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Mon, 1 Jun 2020 13:56:20 -0600
Subject: [PATCH] net.sh: Factor out logic that uploads bins to BSV

---
 net/net.sh | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/net/net.sh b/net/net.sh
index bdcf5b75a..04d63aed6 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -225,6 +225,29 @@ syncScripts() {
     "$ipAddress":~/solana/ > /dev/null
 }
 
+# Deploy local binaries to bootstrap validator.  Other validators and clients later fetch the
+# binaries from it
+deployBootstrapValidator() {
+  declare ipAddress=$1
+
+  echo "Deploying software to bootstrap validator ($ipAddress)"
+  case $deployMethod in
+  tar)
+    rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/bin/* "$ipAddress:~/.cargo/bin/"
+    rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/version.yml "$ipAddress:~/"
+    ;;
+  local)
+    rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/farf/bin/* "$ipAddress:~/.cargo/bin/"
+    ssh "${sshOptions[@]}" -n "$ipAddress" "rm -f ~/version.yml; touch ~/version.yml"
+    ;;
+  skip)
+    ;;
+  *)
+    usage "Internal error: invalid deployMethod: $deployMethod"
+    ;;
+  esac
+}
+
 startBootstrapLeader() {
   declare ipAddress=$1
   declare nodeIndex="$2"
@@ -232,28 +255,13 @@ startBootstrapLeader() {
   echo "--- Starting bootstrap validator: $ipAddress"
   echo "start log: $logFile"
 
-  # Deploy local binaries to bootstrap validator.  Other validators and clients later fetch the
-  # binaries from it
   (
     set -x
     startCommon "$ipAddress" || exit 1
     [[ -z "$externalPrimordialAccountsFile" ]] || rsync -vPrc -e "ssh ${sshOptions[*]}" "$externalPrimordialAccountsFile" \
       "$ipAddress:$remoteExternalPrimordialAccountsFile"
-    case $deployMethod in
-    tar)
-      rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/bin/* "$ipAddress:~/.cargo/bin/"
-      rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/version.yml "$ipAddress:~/"
-      ;;
-    local)
-      rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/farf/bin/* "$ipAddress:~/.cargo/bin/"
-      ssh "${sshOptions[@]}" -n "$ipAddress" "rm -f ~/version.yml; touch ~/version.yml"
-      ;;
-    skip)
-      ;;
-    *)
-      usage "Internal error: invalid deployMethod: $deployMethod"
-      ;;
-    esac
+
+    deployBootstrapValidator "$ipAddress"
 
     ssh "${sshOptions[@]}" -n "$ipAddress" \
       "./solana/net/remote/remote-node.sh \