Replace super imports with crate

ivan770 · Jan 4, 2021 · 6948c27 · 6948c27
1 parent 4d7bc95
commit 6948c27
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 36 deletions.
diff --git a/spartan/http/routing.rs b/spartan/http/routing.rs
@@ -1,10 +1,12 @@
-// use crate::{config::Config, http::middleware::access::Access};
 use std::{convert::Infallible, sync::Arc};
 
 use warp::{any, body::json, delete, get, path, post, wrap_fn, Filter, Rejection, Reply};
 
-use super::middleware::access::{access, AccessError};
-use crate::{actions::ResponseError, node::Manager};
+use crate::{
+    actions::ResponseError,
+    http::middleware::access::{access, AccessError},
+    node::Manager,
+};
 
 macro_rules! route {
     ($name:ident) => {

diff --git a/spartan/http/server.rs b/spartan/http/server.rs
@@ -4,8 +4,7 @@ use thiserror::Error;
 use tokio::signal::ctrl_c;
 use warp::{serve, Error};
 
-use super::routing::attach_routes;
-use crate::node::Manager;
+use crate::{http::routing::attach_routes, node::Manager};
 
 #[derive(Error, Debug)]
 pub enum ServerError {

diff --git a/spartan/node/manager.rs b/spartan/node/manager.rs
@@ -2,18 +2,18 @@ use futures_util::{stream::iter, StreamExt, TryStreamExt};
 use thiserror::Error;
 use warp::hyper::StatusCode;
 
-use super::{
-    event::Event,
-    persistence::{
-        log::Log,
-        snapshot::{PersistMode, Snapshot},
-        PersistenceError,
-    },
-    Node, DB,
-};
 use crate::{
     actions::RespondableError,
     config::{persistence::Persistence, Config},
+    node::{
+        event::Event,
+        persistence::{
+            log::Log,
+            snapshot::{PersistMode, Snapshot},
+            PersistenceError,
+        },
+        Node, DB,
+    },
 };
 
 #[derive(Error, Debug)]

diff --git a/spartan/node/persistence/log/mod.rs b/spartan/node/persistence/log/mod.rs
@@ -14,14 +14,13 @@ use tokio::{
     io::{AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, AsyncWriteExt},
 };
 
-use super::PersistenceError;
 #[cfg(feature = "replication")]
 use crate::node::persistence::snapshot::REPLICATION_FILE as SNAPSHOT_REPLICATION_FILE;
 use crate::{
     config::persistence::PersistenceConfig,
     node::{
         event::{Event, EventLog},
-        persistence::snapshot::Snapshot,
+        persistence::{snapshot::Snapshot, PersistenceError},
         Queue,
     },
 };

diff --git a/spartan/node/persistence/snapshot/mod.rs b/spartan/node/persistence/snapshot/mod.rs
@@ -5,8 +5,10 @@ use cfg_if::cfg_if;
 use serde::{de::DeserializeOwned, Serialize};
 use tokio::fs::{create_dir, read, write};
 
-use super::PersistenceError;
-use crate::{config::persistence::PersistenceConfig, node::Queue};
+use crate::{
+    config::persistence::PersistenceConfig,
+    node::{persistence::PersistenceError, Queue},
+};
 
 const QUEUE_FILE: &str = "queue";
 

diff --git a/spartan/node/queue.rs b/spartan/node/queue.rs
@@ -1,8 +1,8 @@
 use tokio::sync::{Mutex, MutexGuard};
 
-use super::{event::Event, persistence::PersistenceError, Manager};
 #[cfg(feature = "replication")]
 use crate::node::replication::storage::ReplicationStorage;
+use crate::node::{event::Event, persistence::PersistenceError, Manager};
 
 pub struct Queue<DB> {
     /// Inner database

diff --git a/spartan/node/replication/primary/index.rs b/spartan/node/replication/primary/index.rs
@@ -7,11 +7,13 @@ use futures_util::{stream::iter, StreamExt, TryStreamExt};
 use itertools::Itertools;
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use super::{
-    error::{PrimaryError, PrimaryResult},
-    stream::Stream,
+use crate::node::{
+    replication::primary::{
+        error::{PrimaryError, PrimaryResult},
+        stream::Stream,
+    },
+    Manager,
 };
-use crate::node::Manager;
 
 pub struct RecvIndex<'s, T> {
     stream: &'s mut Stream<T>,

diff --git a/spartan/node/replication/primary/stream.rs b/spartan/node/replication/primary/stream.rs
@@ -8,15 +8,17 @@ use tokio::{
 };
 use tokio_util::codec::{Decoder, Framed};
 
-use super::{
-    error::{PrimaryError, PrimaryResult},
-    index::{BatchAskIndex, RecvIndex},
-};
 use crate::{
     config::replication::Primary,
     node::{
         event::Event,
-        replication::message::{PrimaryRequest, ReplicaRequest, Request},
+        replication::{
+            message::{PrimaryRequest, ReplicaRequest, Request},
+            primary::{
+                error::{PrimaryError, PrimaryResult},
+                index::{BatchAskIndex, RecvIndex},
+            },
+        },
     },
     utils::codec::BincodeCodec,
 };

diff --git a/spartan/node/replication/replica/mod.rs b/spartan/node/replication/replica/mod.rs
@@ -15,12 +15,11 @@ use tokio::{
 };
 use tokio_util::codec::{Decoder, Framed};
 
-use super::message::Request;
 use crate::{
     config::replication::Replica,
     node::{
         event::EventLog,
-        replication::message::{PrimaryRequest, ReplicaRequest},
+        replication::message::{PrimaryRequest, ReplicaRequest, Request},
         Manager,
     },
     utils::codec::BincodeCodec,

diff --git a/spartan/node/replication/storage.rs b/spartan/node/replication/storage.rs
@@ -1,6 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-use super::{primary::storage::PrimaryStorage, replica::storage::ReplicaStorage};
+use crate::node::replication::{
+    primary::storage::PrimaryStorage, replica::storage::ReplicaStorage,
+};
 
 #[derive(Serialize, Deserialize)]
 pub enum ReplicationStorage {

diff --git a/spartan_lib/core/db/tree/mod.rs b/spartan_lib/core/db/tree/mod.rs
@@ -5,9 +5,8 @@ use std::{
 
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-use super::StatusAwareDatabase;
 use crate::core::{
-    db::Database,
+    db::{Database, StatusAwareDatabase},
     payload::{Identifiable, Sortable, Status},
 };
 

diff --git a/spartan_lib/core/db/vec/mod.rs b/spartan_lib/core/db/vec/mod.rs
@@ -1,7 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-use super::StatusAwareDatabase;
-use crate::core::{db::Database, payload::Identifiable};
+use crate::core::{
+    db::{Database, StatusAwareDatabase},
+    payload::Identifiable,
+};
 
 /// [`Vec`]-based database
 ///

diff --git a/spartan_lib/core/payload/dispatchable.rs b/spartan_lib/core/payload/dispatchable.rs
@@ -1,4 +1,4 @@
-use super::Identifiable;
+use crate::core::payload::Identifiable;
 
 /// Interface for working with dispatchable messages
 pub trait Dispatchable: Identifiable {