feat(auth): Remove auth message types.

BREAKING CHANGE: Auth message types removed as this is now managed via standard data types
maidsafe · Dec 30, 2020 · 70ab97e · 70ab97e
1 parent 5e06f5d
commit 70ab97e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 174 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -57,15 +57,15 @@ pub use map::{
     UnseqEntryActions as MapUnseqEntryActions, Value as MapValue, Values as MapValues,
 };
 pub use messaging::{
-    Account, AccountRead, AccountWrite, Address, AdultDuties, AuthCmd, AuthQuery,
-    AuthorisationKind, BlobRead, BlobWrite, Cmd, CmdError, DataAuthKind, DataCmd, DataQuery, Duty,
-    ElderDuties, Event, MapRead, MapWrite, Message, MessageId, MiscAuthKind, MoneyAuthKind,
-    MsgEnvelope, MsgSender, NodeCmd, NodeCmdError, NodeDataCmd, NodeDataError, NodeDataQuery,
-    NodeDataQueryResponse, NodeDuties, NodeEvent, NodeQuery, NodeQueryResponse, NodeRewardError,
-    NodeRewardQuery, NodeRewardQueryResponse, NodeSystemCmd, NodeTransferCmd, NodeTransferError,
-    NodeTransferQuery, NodeTransferQueryResponse, Query, QueryResponse, SequenceRead,
-    SequenceWrite, TransferCmd, TransferError, TransferQuery, TransientElderKey,
-    TransientSectionKey, TryFromError, MAX_LOGIN_PACKET_BYTES,
+    Account, AccountRead, AccountWrite, Address, AdultDuties, AuthorisationKind, BlobRead,
+    BlobWrite, Cmd, CmdError, DataAuthKind, DataCmd, DataQuery, Duty, ElderDuties, Event, MapRead,
+    MapWrite, Message, MessageId, MiscAuthKind, MoneyAuthKind, MsgEnvelope, MsgSender, NodeCmd,
+    NodeCmdError, NodeDataCmd, NodeDataError, NodeDataQuery, NodeDataQueryResponse, NodeDuties,
+    NodeEvent, NodeQuery, NodeQueryResponse, NodeRewardError, NodeRewardQuery,
+    NodeRewardQueryResponse, NodeSystemCmd, NodeTransferCmd, NodeTransferError, NodeTransferQuery,
+    NodeTransferQueryResponse, Query, QueryResponse, SequenceRead, SequenceWrite, TransferCmd,
+    TransferError, TransferQuery, TransientElderKey, TransientSectionKey, TryFromError,
+    MAX_LOGIN_PACKET_BYTES,
 };
 pub use money::Money;
 

diff --git a/src/messaging/auth.rs b/src/messaging/auth.rs
diff --git a/src/messaging/cmd.rs b/src/messaging/cmd.rs
@@ -8,24 +8,22 @@
 // Software.
 
 use super::super::transfer::TransferAgreementProof;
-use super::{auth::AuthCmd, data::DataCmd, transfer::TransferCmd, AuthorisationKind};
+use super::{data::DataCmd, transfer::TransferCmd, AuthorisationKind};
 use crate::XorName;
 use serde::{Deserialize, Serialize};
 
 /// TODO: docs
 #[allow(clippy::large_enum_variant)]
 #[derive(Eq, PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub enum Cmd {
-    ///
-    Auth(AuthCmd),
-    ///
+    /// Commands for manipulating data
     Data {
-        ///
+        /// The data command struct itself
         cmd: DataCmd,
-        ///
+        /// Proof of payment for the data command
         payment: TransferAgreementProof,
     },
-    ///
+    /// Command for transfering safe network tokens
     Transfer(TransferCmd),
 }
 
@@ -34,7 +32,6 @@ impl Cmd {
     pub fn authorisation_kind(&self) -> AuthorisationKind {
         use Cmd::*;
         match self {
-            Auth(c) => c.authorisation_kind(),
             Data { cmd, .. } => cmd.authorisation_kind(),
             Transfer(c) => c.authorisation_kind(),
         }
@@ -44,7 +41,6 @@ impl Cmd {
     pub fn dst_address(&self) -> XorName {
         use Cmd::*;
         match self {
-            Auth(c) => c.dst_address(),
             Data { cmd, .. } => cmd.dst_address(),
             Transfer(c) => c.dst_address(),
         }

diff --git a/src/messaging/mod.rs b/src/messaging/mod.rs
@@ -8,7 +8,6 @@
 // Software.
 
 mod account;
-mod auth;
 mod blob;
 mod cmd;
 mod data;
@@ -22,7 +21,6 @@ mod transfer;
 
 pub use self::{
     account::{Account, AccountRead, AccountWrite, MAX_LOGIN_PACKET_BYTES},
-    auth::{AuthCmd, AuthQuery},
     blob::{BlobRead, BlobWrite},
     cmd::Cmd,
     data::{DataCmd, DataQuery},
@@ -125,8 +123,6 @@ impl MsgEnvelope {
         use Address::*;
         use Cmd::*;
         match cmd {
-            // temporary case, while not impl at `Authenticator`
-            Auth(_) => Ok(Section(self.origin.address().xorname())),
             // always to `Payment` section
             Transfer(c) => Ok(Section(c.dst_address())),
             // Data dst (after reaching `Gateway`)

diff --git a/src/messaging/query.rs b/src/messaging/query.rs
@@ -7,18 +7,14 @@
 // specific language governing permissions and limitations relating to use of the SAFE Network
 // Software.
 
-use super::{
-    auth::AuthQuery, data::DataQuery, transfer::TransferQuery, AuthorisationKind, QueryResponse,
-};
+use super::{data::DataQuery, transfer::TransferQuery, AuthorisationKind, QueryResponse};
 use crate::{Error, XorName};
 use serde::{Deserialize, Serialize};
 
 /// TODO: docs
 #[allow(clippy::large_enum_variant)]
 #[derive(Hash, Eq, PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub enum Query {
-    ///
-    Auth(AuthQuery),
     ///
     Data(DataQuery),
     ///
@@ -30,7 +26,6 @@ impl Query {
     pub fn authorisation_kind(&self) -> AuthorisationKind {
         use Query::*;
         match self {
-            Auth(q) => q.authorisation_kind(),
             Data(q) => q.authorisation_kind(),
             Transfer(q) => q.authorisation_kind(),
         }
@@ -41,7 +36,6 @@ impl Query {
     pub fn error(&self, error: Error) -> QueryResponse {
         use Query::*;
         match self {
-            Auth(q) => q.error(error),
             Data(q) => q.error(error),
             Transfer(q) => q.error(error),
         }
@@ -51,7 +45,6 @@ impl Query {
     pub fn dst_address(&self) -> XorName {
         use Query::*;
         match self {
-            Auth(q) => q.dst_address(),
             Data(q) => q.dst_address(),
             Transfer(q) => q.dst_address(),
         }