merge membership and authenticate into standing

1 files changed, 10 insertions, 14 deletions

diff --git a/src/swarm/peer.rs b/src/swarm/peer.rs
index cec8842..9de0ce0 100644
--- a/src/swarm/peer.rs
+++ b/src/swarm/peer.rs
@@ -13,7 +13,7 @@ use tracing::{debug, info, instrument, trace, warn};
 
 use crate::document::replica::{Epoch, EpochRelation};
 use crate::document::store::{self, StoreError};
-use crate::state::{AppState, HelloState, Liveness, PeerMembership, PeerState};
+use crate::state::{AppState, HelloState, Liveness, PeerState, Standing};
 use crate::swarm::sync::{SyncEvent, handle_sync};
 use crate::transport::{self, ParsedMessage};
 
@@ -479,7 +479,7 @@ async fn establish_peer(
     let peer_state_mutex = state.get_or_create_peer_state(peer).await;
     let mut peer_state = peer_state_mutex.lock().await;
 
-    if let PeerMembership::Member { swarm_id: existing } = &peer_state.membership {
+    if let Standing::Member { swarm_id: existing } = &peer_state.standing {
         if existing != &swarm_id {
             bail!(
                 "Peer {peer} changed swarm identity from {} to {}",
@@ -494,8 +494,8 @@ async fn establish_peer(
         state.set_expected_swarm_id(swarm_id.clone()).await?;
     }
 
-    if matches!(peer_state.membership, PeerMembership::Unknown) {
-        peer_state.membership = PeerMembership::Member {
+    if !matches!(peer_state.standing, Standing::Member { .. }) {
+        peer_state.standing = Standing::Member {
             swarm_id: swarm_id.clone(),
         };
     }
@@ -518,10 +518,7 @@ async fn establish_peer(
 pub(crate) async fn peer_swarm(state: &AppState, peer: &str) -> Option<String> {
     let peer_state_mutex = state.get_peer_state(peer).await?;
     let peer_state = peer_state_mutex.lock().await;
-    match &peer_state.membership {
-        PeerMembership::Unknown => None,
-        PeerMembership::Member { swarm_id } => Some(swarm_id.clone()),
-    }
+    peer_state.standing.swarm_id().map(str::to_owned)
 }
 
 // --- epochs ------------------------------------------------------------------
@@ -609,8 +606,8 @@ async fn admit(state: &AppState, peer: &str, message: &ParsedMessage) -> bool {
             remember_peer(state, peer).await;
             if let Some(peer_state) = state.get_peer_state(peer).await {
                 let mut peer_state = peer_state.lock().await;
-                if !peer_state.authenticated {
-                    peer_state.authenticated = true;
+                if peer_state.standing == Standing::Stranger {
+                    peer_state.standing = Standing::Admitted;
                     debug!(peer = %peer, "Peer proved the swarm key");
                 }
             }
@@ -622,11 +619,10 @@ async fn admit(state: &AppState, peer: &str, message: &ParsedMessage) -> bool {
             // we stop syncing our document to it, not just listening to it.
             if let Some(peer_state) = state.get_peer_state(peer).await {
                 let mut peer_state = peer_state.lock().await;
-                if peer_state.authenticated {
+                if peer_state.standing.is_admitted() {
                     warn!(peer = %peer, "Peer no longer proves the swarm key; dropping its membership");
                 }
-                peer_state.authenticated = false;
-                peer_state.membership = PeerMembership::Unknown;
+                peer_state.standing = Standing::Stranger;
                 peer_state.hello_state = HelloState::NotSent;
                 peer_state.reset_sync();
             }
@@ -643,7 +639,7 @@ async fn admit(state: &AppState, peer: &str, message: &ParsedMessage) -> bool {
         }
         None => {
             let admitted = match state.get_peer_state(peer).await {
-                Some(peer_state) => peer_state.lock().await.authenticated,
+                Some(peer_state) => peer_state.lock().await.standing.is_admitted(),
                 None => false,
             };
             if !admitted {