rename cluster to swarm everywhere!

1 files changed, 14 insertions, 14 deletions

diff --git a/src/swarm/bootstrap.rs b/src/swarm/bootstrap.rs
index 47fadfa..b279cb1 100644
--- a/src/swarm/bootstrap.rs
+++ b/src/swarm/bootstrap.rs
@@ -1,4 +1,4 @@
-//! Joining a cluster (or creating one as the genesis node).
+//! Joining a swarm (or creating one as the genesis node).
 
 use std::sync::atomic::Ordering;
 use std::time::Duration;
@@ -23,7 +23,7 @@ pub(crate) async fn bootstrap(state: &AppState, seeds: &[String]) -> Result<()>
 
     info!(
         timeout_seconds = BOOTSTRAP_TIMEOUT.as_secs(),
-        "Joining existing cluster"
+        "Joining existing swarm"
     );
 
     let mut peers = Vec::new();
@@ -51,12 +51,12 @@ pub(crate) async fn bootstrap(state: &AppState, seeds: &[String]) -> Result<()>
 
     let deadline = tokio::time::Instant::now() + BOOTSTRAP_TIMEOUT;
     loop {
-        if let Some(cluster_id) = state.cluster_id().await {
-            // A node joining a compacted cluster rejoins the newer epoch first; it is
+        if let Some(swarm_id) = state.swarm_id().await {
+            // A node joining a compacted swarm rejoins the newer epoch first; it is
             // ready only once that rejoin verified the epoch.
             if state.initial_sync_done.load(Ordering::Acquire) && !state.remake.is_rejoining() {
-                state.mark_ready(cluster_id.clone()).await?;
-                info!(cluster_id = %cluster_id, "Node is ready");
+                state.mark_ready(swarm_id.clone()).await?;
+                info!(swarm_id = %swarm_id, "Node is ready");
                 return Ok(());
             }
         }
@@ -68,22 +68,22 @@ pub(crate) async fn bootstrap(state: &AppState, seeds: &[String]) -> Result<()>
 
             for (peer, peer_state_mutex) in &peer_states {
                 let peer_state = peer_state_mutex.lock().await;
-                let validated_cluster = match &peer_state.membership {
+                let validated_swarm = match &peer_state.membership {
                     PeerMembership::Unknown => None,
-                    PeerMembership::Member { cluster_id } => Some(cluster_id.as_str()),
+                    PeerMembership::Member { swarm_id } => Some(swarm_id.as_str()),
                 };
                 peer_diagnostics.push(format!(
-                    "{peer}: validated_cluster={:?}, epoch={:?}, pending_inbound_sync={}",
-                    validated_cluster,
+                    "{peer}: validated_swarm={:?}, epoch={:?}, pending_inbound_sync={}",
+                    validated_swarm,
                     peer_state.epoch,
                     peer_state.pending_inbound_sync.len()
                 ))
             }
-            let local_cluster = state.cluster_id().await;
+            let local_swarm = state.swarm_id().await;
             let local_epoch = state.local_epoch();
             let initial_sync_done = state.initial_sync_done.load(Ordering::Acquire);
             error!(
-                local_cluster = ?local_cluster,
+                local_swarm = ?local_swarm,
                 local_epoch = %local_epoch,
                 initial_sync_done,
                 peers = %peer_diagnostics.join("; "),
@@ -91,9 +91,9 @@ pub(crate) async fn bootstrap(state: &AppState, seeds: &[String]) -> Result<()>
                 "Bootstrap timed out"
             );
             bail!(
-                "Bootstrap timed out after {:?}; local_cluster={:?}; local_epoch={}; initial_sync_done={}; peers=[{}]. Refusing to create a genesis document.",
+                "Bootstrap timed out after {:?}; local_swarm={:?}; local_epoch={}; initial_sync_done={}; peers=[{}]. Refusing to create a genesis document.",
                 BOOTSTRAP_TIMEOUT,
-                local_cluster,
+                local_swarm,
                 local_epoch,
                 initial_sync_done,
                 peer_diagnostics.join("; ")