clean up use statements

Author: elpiel

primitives/src/lib.rs

@@ -11,8 +11,7 @@ pub use self::{
     balances_map::{BalancesMap, UnifiedMap},
     big_num::BigNum,
     campaign::{Campaign, CampaignId},
-    channel::Channel,
-    channel::ChannelId,
+    channel::{Channel, ChannelId},
     config::Config,
     deposit::Deposit,
     event_submission::EventSubmission,

primitives/src/util/tests/prep_db.rs

@@ -53,7 +53,6 @@ lazy_static! {
 
     // Dummy adapter auth tokens
     // authorization tokens
-    ///
     pub static ref AUTH: HashMap<String, String> = {
         let mut auth = HashMap::new();
 

sentry/src/db/event_aggregate.rs

@@ -2,10 +2,9 @@ use chrono::{DateTime, Utc};
 use futures::pin_mut;
 use primitives::{
     balances::UncheckedState,
-    channel::Channel as ChannelV5,
     sentry::{EventAggregate, MessageResponse},
     validator::{ApproveState, Heartbeat, NewState},
-    Address, BigNum, ChannelId, ValidatorId,
+    Address, BigNum, Channel, ChannelId, ValidatorId,
 };
 use std::{convert::TryFrom, ops::Add};
 use tokio_postgres::{
@@ -17,7 +16,7 @@ use super::{DbPool, PoolError};
 
 pub async fn latest_approve_state_v5(
     pool: &DbPool,
-    channel: &ChannelV5,
+    channel: &Channel,
 ) -> Result<Option<MessageResponse<ApproveState>>, PoolError> {
     let client = pool.get().await?;
 
@@ -34,7 +33,7 @@ pub async fn latest_approve_state_v5(
 
 pub async fn latest_new_state_v5(
     pool: &DbPool,
-    channel: &ChannelV5,
+    channel: &Channel,
     state_root: &str,
 ) -> Result<Option<MessageResponse<NewState<UncheckedState>>>, PoolError> {
     let client = pool.get().await?;

sentry/src/routes/event_aggregate.rs

@@ -2,7 +2,7 @@ use chrono::{serde::ts_milliseconds_option, DateTime, Utc};
 use hyper::{Body, Request, Response};
 use serde::Deserialize;
 
-use primitives::{adapter::Adapter, channel::Channel, sentry::EventAggregateResponse};
+use primitives::{adapter::Adapter, sentry::EventAggregateResponse, Channel};
 
 use crate::{success_response, Application, Auth, ResponseError};
 

validator_worker/src/main.rs

@@ -5,21 +5,17 @@ use std::{convert::TryFrom, error::Error, time::Duration};
 
 use clap::{crate_version, App, Arg};
 use futures::future::{join, join_all};
-use tokio::{
-    runtime::Runtime,
-    // time::{sleep, timeout},
-    time::sleep,
-};
+use tokio::{runtime::Runtime, time::sleep};
 
 use adapter::{AdapterTypes, DummyAdapter, EthereumAdapter};
 use primitives::{
     adapter::{Adapter, DummyAdapterOptions, KeystoreOptions},
-    // channel::Channel as ChannelV5,
     config::{configuration, Config},
-    util::tests::prep_db::{AUTH, IDS},
-    util::ApiUrl,
+    util::{
+        tests::prep_db::{AUTH, IDS},
+        ApiUrl,
+    },
     ValidatorId,
-    // Campaign, ChannelId, SpecValidator,
 };
 use slog::{error, info, Logger};
 use std::fmt::Debug;