fix: merge issues

samparsky · samparsky · commit a81617d4f44b · 2020-01-21T12:08:44.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sentry/src/db/event_aggregate.rs b/sentry/src/db/event_aggregate.rs
@@ -117,7 +117,7 @@ pub async fn insert_event_aggregate(
                 data.extend(vec![EventData {
                     id: id.clone(),
                     event_type: event_type.clone(),
-                    earner: Some(earner.clone()),
+                    earner: Some(earner.to_string()),
                     event_count: event_count.to_string(),
                     event_payout: event_payout.to_string(),
                     created,
diff --git a/sentry/src/event_reducer.rs b/sentry/src/event_reducer.rs
@@ -1,5 +1,5 @@
 use primitives::sentry::{AggregateEvents, Event, EventAggregate};
-use primitives::Channel;
+use primitives::{Channel, ValidatorId};
 
 // @TODO: Remove attribute once we use this function!
 #[allow(dead_code)]
