From a6312ba98f054eb713c1d71754b779b277e26f7c Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 5 Dec 2018 17:03:49 -0800
Subject: [PATCH] Switch snap to bootstrap-fullnode/fullnode naming

---
 book/src/getting-started.md | 16 ++++++++--------
 multinode-demo/common.sh    |  2 +-
 net/remote/remote-node.sh   |  4 ++--
 snap/hooks/configure        | 14 +++++++-------
 snap/snapcraft.yaml         |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/book/src/getting-started.md b/book/src/getting-started.md
index 889586285..d82dd0c98 100644
--- a/book/src/getting-started.md
+++ b/book/src/getting-started.md
@@ -177,7 +177,7 @@ Runtime configuration files for the daemon can be found in
 #### Leader Daemon
 
 ```bash
-$ sudo snap set solana mode=leader
+$ sudo snap set solana mode=bootstrap-fullnode
 ```
 
 `rsync` must be configured and running on the leader.
@@ -200,24 +200,24 @@ to port tcp:873, tcp:9900 and the port range udp:8000-udp:10000**
 To run both the Leader and Drone:
 
 ```bash
-$ sudo snap set solana mode=leader+drone
+$ sudo snap set solana mode=bootstrap-fullnode+drone
 
 ```
 
 #### Validator daemon
 
 ```bash
-$ sudo snap set solana mode=validator
+$ sudo snap set solana mode=fullnode
 
 ```
 
-By default the validator will connect to **testnet.solana.com**, override
-the leader IP address by running:
+By default the node will attempt to connect to **testnet.solana.com**, override the
+cluster entrypoint IP address by running:
 
 ```bash
-$ sudo snap set solana mode=validator leader-address=127.0.0.1 #<-- change IP address
+$ sudo snap set solana mode=fullnode entrypoint-ip=127.0.0.1 #<-- change IP address
 ```
 
-It's assumed that the leader will be running `rsync` configured as described in
-the previous **Leader daemon** section.
+It's assumed that the node at the entrypoint IP will be running `rsync`
+configured as described in the previous **Leader daemon** section.
 
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index b084fe90c..67692d274 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -166,7 +166,7 @@ find_leader() {
     fi
 
     # Select leader from the Snap configuration
-    leader_ip=$(snapctl get leader-ip)
+    leader_ip=$(snapctl get entrypoint-ip)
     if [[ -z $leader_ip ]]; then
       leader=testnet.solana.com
       leader_ip=$(dig +short "${leader%:*}" | head -n1)
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index f3a6b3b97..6c1b572de 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -48,7 +48,7 @@ snap)
 
   # shellcheck disable=SC2089
   commonNodeConfig="\
-    leader-ip=\"$entrypointIp\" \
+    entrypoint-ip=\"$entrypointIp\" \
     metrics-config=\"$SOLANA_METRICS_CONFIG\" \
     rust-log=\"$RUST_LOG\" \
     setup-args=\"$setupArgs\" \
@@ -64,7 +64,7 @@ snap)
   fi
 
   if [[ $nodeType = bootstrap-fullnode ]]; then
-    nodeConfig="mode=leader+drone $commonNodeConfig"
+    nodeConfig="mode=bootstrap-fullnode+drone $commonNodeConfig"
     ln -sf -T /var/snap/solana/current/leader/current fullnode.log
     ln -sf -T /var/snap/solana/current/drone/current drone.log
   else
diff --git a/snap/hooks/configure b/snap/hooks/configure
index d6569ced2..4910f6cec 100755
--- a/snap/hooks/configure
+++ b/snap/hooks/configure
@@ -2,7 +2,7 @@
 
 echo Stopping daemons
 snapctl stop --disable solana.daemon-drone
-snapctl stop --disable solana.daemon-leader
+snapctl stop --disable solana.daemon-bootstrap-fullnode
 snapctl stop --disable solana.daemon-validator
 snapctl stop --disable solana.daemon-oom-monitor
 snapctl stop --disable solana.daemon-net-stats
@@ -18,18 +18,18 @@ num_tokens="${num_tokens:+-n $num_tokens}"
 setup_args="$(snapctl get setup-args)"
 
 case $mode in
-leader+drone)
+bootstrap-fullnode+drone)
   "$SNAP"/multinode-demo/setup.sh -t leader $num_tokens -p $setup_args
   snapctl start --enable solana.daemon-drone
-  snapctl start --enable solana.daemon-leader
+  snapctl start --enable solana.daemon-bootstrap-fullnode
   ;;
-leader)
+bootstrap-fullnode)
   "$SNAP"/multinode-demo/setup.sh -t leader $num_tokens -p $setup_args
-  snapctl start --enable solana.daemon-leader
+  snapctl start --enable solana.daemon-bootstrap-fullnode
   ;;
-validator)
+fullnode)
   "$SNAP"/multinode-demo/setup.sh -t validator -p $setup_args
-  snapctl start --enable solana.daemon-validator
+  snapctl start --enable solana.daemon-fullnode
   ;;
 *)
   echo "Error: Unknown mode: $mode"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index da9fa6dac..28bbde2a0 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -53,13 +53,13 @@ apps:
     plugs:
       - network
       - home
-  daemon-validator:
+  daemon-fullnode:
     daemon: simple
     command: scripts/snap-config-to-env.sh $SNAP/multinode-demo/validator.sh
     plugs:
       - network
       - network-bind
-  daemon-leader:
+  daemon-bootstrap-fullnode:
     daemon: simple
     command: scripts/snap-config-to-env.sh $SNAP/multinode-demo/leader.sh
     plugs: