net.sh: Factor out logic that uploads bins to BSV

net/net.sh

@@ -225,20 +225,12 @@ syncScripts() {
     "$ipAddress":~/solana/ > /dev/null
 }
 
-startBootstrapLeader() {
+# Deploy local binaries to bootstrap validator.  Other validators and clients later fetch the
+# binaries from it
+deployBootstrapValidator() {
   declare ipAddress=$1
-  declare nodeIndex="$2"
-  declare logFile="$3"
-  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"
+  echo "Deploying software to bootstrap validator ($ipAddress)"
   case $deployMethod in
   tar)
     rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/bin/* "$ipAddress:~/.cargo/bin/"
@@ -254,6 +246,22 @@ startBootstrapLeader() {
     usage "Internal error: invalid deployMethod: $deployMethod"
     ;;
   esac
+}
+
+startBootstrapLeader() {
+  declare ipAddress=$1
+  declare nodeIndex="$2"
+  declare logFile="$3"
+  echo "--- Starting bootstrap validator: $ipAddress"
+  echo "start log: $logFile"
+
+  (
+    set -x
+    startCommon "$ipAddress" || exit 1
+    [[ -z "$externalPrimordialAccountsFile" ]] || rsync -vPrc -e "ssh ${sshOptions[*]}" "$externalPrimordialAccountsFile" \
+      "$ipAddress:$remoteExternalPrimordialAccountsFile"
+
+    deployBootstrapValidator "$ipAddress"
 
     ssh "${sshOptions[@]}" -n "$ipAddress" \
       "./solana/net/remote/remote-node.sh \