fix(comms): do not take connectivity complaints from adults

maidsafe · Jun 4, 2021 · f76b3a2 · f76b3a2
1 parent 693f61c
commit f76b3a2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 149 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,8 @@ qp2p = "~0.11.9"
 rand = "~0.7.3"
 rand_chacha = "~0.2.2"
 resource_proof = "0.8.0"
-sn_messaging = "29.0.0"
+#sn_messaging = "29.0.0"
+sn_messaging = { path = "../sn_messaging" }
 sn_data_types = "~0.18.3"
 thiserror = "1.0.23"
 tokio = "1.3.0"

diff --git a/src/routing/connectivity_complaints.rs b/src/routing/connectivity_complaints.rs
diff --git a/src/routing/core/connectivity.rs b/src/routing/core/connectivity.rs
@@ -16,10 +16,7 @@ use crate::{
     Error,
 };
 use bls_dkg::key_gen::message::Message as DkgMessage;
-use sn_messaging::{
-    node::{DkgFailureProof, DkgFailureProofSet, DkgKey, ElderCandidates, Proposal, Variant},
-    DstLocation,
-};
+use sn_messaging::node::{DkgFailureProof, DkgFailureProofSet, DkgKey, ElderCandidates, Proposal};
 use std::{collections::BTreeSet, iter, net::SocketAddr, slice};
 use xor_name::XorName;
 
@@ -104,32 +101,6 @@ impl Core {
         }
     }
 
-    pub(crate) async fn handle_connectivity_complaint(
-        &self,
-        sender: XorName,
-        elder_name: XorName,
-    ) -> Result<Vec<Command>> {
-        self.connectivity_complaints
-            .add_complaint(sender, elder_name)
-            .await;
-
-        let weighing_adults: BTreeSet<XorName> = self
-            .section
-            .members()
-            .joined()
-            .map(|info| *info.peer.name())
-            .collect();
-        if self
-            .connectivity_complaints
-            .is_complained(elder_name, &weighing_adults)
-            .await
-        {
-            self.propose_offline(elder_name)
-        } else {
-            Ok(vec![])
-        }
-    }
-
     pub fn handle_connection_lost(&self, addr: SocketAddr) -> Result<Vec<Command>> {
         if let Some(peer) = self.section.find_joined_member_by_addr(&addr) {
             debug!(
@@ -157,28 +128,8 @@ impl Core {
         };
 
         if !self.is_elder() {
-            // When self is not an elder, then the peer has to be an elder, and we shall complaint
-            // the lost to other elders.
-            let variant = Variant::ConnectivityComplaint(name);
-            let recipients: Vec<_> = self
-                .section
-                .proven_authority_provider()
-                .value
-                .peers()
-                .filter(|peer| *peer.name() != name)
-                .collect();
-            trace!(
-                "Casting connectivity complaint against {:?} {:?}",
-                name,
-                recipients
-            );
-
-            return self.send_message_for_dst_accumulation(
-                self.node.name(),
-                DstLocation::DirectAndUnrouted,
-                variant,
-                &recipients,
-            );
+            // Adults cannot complain about connectivity.
+            return Ok(vec![]);
         }
 
         self.propose_offline(name)

diff --git a/src/routing/core/messaging/handling/decisions.rs b/src/routing/core/messaging/handling/decisions.rs
@@ -23,7 +23,7 @@ use xor_name::XorName;
 impl Core {
     pub(crate) fn decide_message_status(&self, msg: &RoutingMsg) -> Result<MessageStatus> {
         match msg.variant() {
-            Variant::SectionKnowledge { .. } | Variant::ConnectivityComplaint(_) => {
+            Variant::SectionKnowledge { .. } => {
                 if !self.is_elder() {
                     return Ok(MessageStatus::Useless);
                 }

diff --git a/src/routing/core/messaging/handling/mod.rs b/src/routing/core/messaging/handling/mod.rs
@@ -355,10 +355,6 @@ impl Core {
                 commands.extend(result?);
                 Ok(commands)
             }
-            Variant::ConnectivityComplaint(elder_name) => {
-                self.handle_connectivity_complaint(msg.src.name(), *elder_name)
-                    .await
-            }
             Variant::NodeApproval { .. }
             | Variant::JoinRetry { .. }
             | Variant::ResourceChallenge { .. } => {

diff --git a/src/routing/core/mod.rs b/src/routing/core/mod.rs
@@ -12,10 +12,7 @@ mod delivery_group;
 mod messaging;
 mod public_api;
 
-use super::{
-    command::Command, connectivity_complaints::ConnectivityComplaints,
-    enduser_registry::EndUserRegistry, split_barrier::SplitBarrier,
-};
+use super::{command::Command, enduser_registry::EndUserRegistry, split_barrier::SplitBarrier};
 use crate::{
     agreement::{DkgVoter, ProposalAggregator},
     error::Result,
@@ -60,7 +57,6 @@ pub(crate) struct Core {
     joins_allowed: bool,
     resource_proof: ResourceProof,
     end_users: EndUserRegistry,
-    connectivity_complaints: ConnectivityComplaints,
 }
 
 impl Core {
@@ -88,7 +84,6 @@ impl Core {
             joins_allowed: true,
             resource_proof: ResourceProof::new(RESOURCE_PROOF_DATA_SIZE, RESOURCE_PROOF_DIFFICULTY),
             end_users: EndUserRegistry::new(),
-            connectivity_complaints: ConnectivityComplaints::new(),
         }
     }
 

diff --git a/src/routing/mod.rs b/src/routing/mod.rs
@@ -10,7 +10,6 @@ pub(crate) mod command;
 
 mod bootstrap;
 mod comm;
-mod connectivity_complaints;
 mod core;
 mod dispatcher;
 mod enduser_registry;