Merge branch 'aip-61-adex-v5' into v5-validator-workflow

Author: elpiel

adapter/src/dummy.rs

@@ -5,9 +5,8 @@ use primitives::{
         Adapter, AdapterErrorKind, AdapterResult, Deposit, DummyAdapterOptions,
         Error as AdapterError, Session,
     },
-    channel::Channel,
     config::Config,
-    Address, ChannelId, ToETHChecksum, ValidatorId,
+    Address, Channel, ChannelId, ToETHChecksum, ValidatorId,
 };
 use std::{collections::HashMap, fmt, sync::Arc};
 

adapter/src/ethereum.rs

@@ -9,9 +9,8 @@ use ethstore::{
 use lazy_static::lazy_static;
 use primitives::{
     adapter::{Adapter, AdapterResult, Deposit, Error as AdapterError, KeystoreOptions, Session},
-    channel::Channel,
     config::Config,
-    Address, BigNum, ToETHChecksum, ValidatorId,
+    Address, BigNum, Channel, ToETHChecksum, ValidatorId,
 };
 use reqwest::Client;
 use serde::{Deserialize, Serialize};

primitives/src/campaign.rs

@@ -1,5 +1,5 @@
 use crate::{
-    channel::Channel, targeting::Rules, AdUnit, Address, EventSubmission, UnifiedNum, Validator,
+    targeting::Rules, AdUnit, Address, Channel, EventSubmission, UnifiedNum, Validator,
     ValidatorDesc, ValidatorId,
 };
 
@@ -358,7 +358,7 @@ pub mod validators {
 
 #[cfg(feature = "postgres")]
 mod postgres {
-    use crate::channel::Channel;
+    use crate::Channel;
 
     use super::{Active, Campaign, CampaignId, PricingBounds, Validators};
     use bytes::BytesMut;

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/sentry.rs

@@ -300,7 +300,7 @@ impl fmt::Display for ChannelReport {
 }
 
 pub mod channel_list {
-    use crate::{channel::Channel, ValidatorId};
+    use crate::{Channel, ValidatorId};
     use serde::{Deserialize, Serialize};
 
     use super::Pagination;
@@ -360,9 +360,8 @@ pub mod campaign_create {
 
     use crate::{
         campaign::{prefix_active, Active, PricingBounds, Validators},
-        channel::Channel,
         targeting::Rules,
-        AdUnit, Address, Campaign, CampaignId, EventSubmission, UnifiedNum,
+        AdUnit, Address, Campaign, CampaignId, Channel, EventSubmission, UnifiedNum,
     };
 
     #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]

primitives/src/spender.rs

@@ -1,4 +1,4 @@
-use crate::{channel::Channel, Address, Deposit, UnifiedNum};
+use crate::{Address, Channel, Deposit, UnifiedNum};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

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/channel.rs

@@ -95,9 +95,8 @@ pub async fn insert_validator_messages(
 
 mod list_channels {
     use primitives::{
-        channel::Channel,
         sentry::{channel_list::ChannelListResponse, Pagination},
-        ValidatorId,
+        Channel, ValidatorId,
     };
     use std::str::FromStr;
     use tokio_postgres::types::{accepts, FromSql, Type};

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/campaign.rs

@@ -13,11 +13,10 @@ use hyper::{Body, Request, Response};
 use primitives::{
     adapter::{Adapter, AdapterErrorKind, Error as AdapterError},
     campaign_validator::Validator,
-    channel::Channel,
     config::TokenInfo,
     sentry::campaign_create::{CreateCampaign, ModifyCampaign},
     spender::Spendable,
-    Address, Campaign, Deposit, UnifiedNum,
+    Address, Campaign, Channel, Deposit, UnifiedNum,
 };
 use slog::error;
 use std::cmp::{max, Ordering};

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/follower.rs

@@ -4,11 +4,10 @@ use primitives::{
     adapter::{Adapter, AdapterErrorKind, Error as AdapterError},
     balances,
     balances::{Balances, CheckedState, UncheckedState},
-    channel::Channel,
     config::TokenInfo,
     spender::Spender,
     validator::{ApproveState, MessageTypes, NewState, RejectState},
-    Address, ChannelId, UnifiedNum,
+    Address, Channel, ChannelId, UnifiedNum,
 };
 
 use crate::{

validator_worker/src/leader.rs

@@ -4,10 +4,9 @@ use thiserror::Error;
 use primitives::{
     adapter::{Adapter, AdapterErrorKind, Error as AdapterError},
     balances::CheckedState,
-    channel::Channel,
     config::TokenInfo,
     validator::{MessageError, MessageTypes, NewState},
-    Balances, ChannelId,
+    Balances, Channel, ChannelId,
 };
 
 use crate::{

validator_worker/src/sentry_interface.rs

@@ -15,7 +15,7 @@ use primitives::{
     spender::Spender,
     util::ApiUrl,
     validator::MessageTypes,
-    Address, {ChannelId, Config, ValidatorId},
+    Address, Campaign, ChannelId, Config, ValidatorId,
 };
 use thiserror::Error;
 
@@ -263,10 +263,9 @@ async fn propagate_to<A: Adapter>(
 pub mod channels {
     use futures::{future::try_join_all, TryFutureExt};
     use primitives::{
-        channel::Channel,
         sentry::channel_list::{ChannelListQuery, ChannelListResponse},
         util::ApiUrl,
-        ValidatorId,
+        Channel, ValidatorId,
     };
     use reqwest::{Client, Response};