diff options
Diffstat (limited to 'src/swarm')
| -rw-r--r-- | src/swarm/peer.rs | 5 | ||||
| -rw-r--r-- | src/swarm/sync.rs | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/swarm/peer.rs b/src/swarm/peer.rs index adde444..836a967 100644 --- a/src/swarm/peer.rs +++ b/src/swarm/peer.rs @@ -171,7 +171,7 @@ pub(crate) async fn remember_peer(state: &AppState, peer: &str) { let mut peer_states = state.peer_states.write().await; if !peer_states.contains_key(peer) { - peer_states.entry(peer.to_owned()).or_default(); + peer_states.insert(peer.to_owned(), state.new_peer_state(peer)); info!( peer = %peer, peer_count = peer_states.len(), @@ -410,8 +410,7 @@ pub(crate) async fn run_peer_worker(state: AppState) { let (became_dormant, ping_due, unanswered) = { let mut peer_state = peer_state_mutex.lock().await; let became_dormant = ready && peer_state.check_dormancy(&state.timing, now); - let we_ping = crate::swarm::pair::leads(state.local_id(), peer); - let ping_due = peer_state.take_keepalive_due(&state.timing, we_ping, now); + let ping_due = peer_state.take_keepalive_due(&state.timing, now); let unanswered = peer_state.take_overdue_sync_reply(now); (became_dormant, ping_due, unanswered) }; diff --git a/src/swarm/sync.rs b/src/swarm/sync.rs index 91c6eee..1335361 100644 --- a/src/swarm/sync.rs +++ b/src/swarm/sync.rs @@ -63,8 +63,7 @@ async fn deliver_sync_to_peer(state: &AppState, peer: &str, retry_delivery: bool }; if !retry_delivery { - let we_open = crate::swarm::pair::leads(state.local_id(), peer); - if let Some(wait) = peer_state.opening_wait(we_open, Instant::now()) { + if let Some(wait) = peer_state.sync.opening_wait(Instant::now()) { trace!( wait_ms = wait.as_millis(), "Leaving the opening sync message to the peer" @@ -149,10 +148,6 @@ async fn deliver_sync_to_peer(state: &AppState, peer: &str, retry_delivery: bool .collect(); peer_state.sync.expect_reply(sent, Instant::now()); } - if message.is_some() { - // It carries our epoch. - peer_state.epoch_unannounced = false; - } (epoch, message) }; let Some(message) = message else { |