Merge pull request #237 from AdExNetwork/issue-9-get-event-aggregates

Issue #9 GET Channel's Event Aggregates remove EarnerAddress

Author: elpiel

primitives/src/sentry.rs

@@ -62,8 +62,6 @@ pub struct Earner {
     pub promilles: u64,
 }
 
-pub type EarnerAddress = ValidatorId;
-
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EventAggregate {

sentry/src/lib.rs

@@ -25,7 +25,6 @@ pub mod middleware {
     pub mod auth;
     pub mod channel;
     pub mod cors;
-    pub mod event_aggregate;
 }
 
 pub mod routes {
@@ -48,8 +47,7 @@ lazy_static! {
     static ref CHANNEL_STATUS_BY_CHANNEL_ID: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/status/?$").expect("The regex should be valid");
     // Only the initial Regex to be matched.
     static ref CHANNEL_VALIDATOR_MESSAGES: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/validator-messages(/.*)?$").expect("The regex should be valid");
-    static ref CHANNEL_EVENTS_AGGREGATES: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/events-aggregates(/|/0x[a-zA-Z0-9]{40}/?)?$").expect("The regex should be valid");
-    // @TODO define other regex routes
+    static ref CHANNEL_EVENTS_AGGREGATES: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/events-aggregates/?$").expect("The regex should be valid");
     static ref ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
     static ref ADVERTISER_ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/for-advertiser/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
 }