Merge branch 'dev' into issue-243-contrafactual-accounts

Author: elpiel

Cargo.lock

@@ -11,7 +11,7 @@ use crate::{AdUnit, EventSubmission, TargetingTag, ValidatorDesc, ValidatorId};
 use hex::{FromHex, FromHexError};
 use std::ops::Deref;
 
-#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Copy, Clone)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Copy, Clone, Hash)]
 #[serde(transparent)]
 pub struct ChannelId(#[serde(with = "SerHex::<StrictPfx>")] [u8; 32]);
 

primitives/src/channel.rs

@@ -20,7 +20,7 @@ lazy_static! {
         ids.insert("user".into(), ValidatorId::try_from("0x20754168c00a6e58116ccfd0a5f7d1bb66c5de9d").expect("failed to parse id"));
         ids.insert("publisher".into(), ValidatorId::try_from("0xb7d3f81e857692d13e9d63b232a90f4a1793189e").expect("failed to parse id"));
         ids.insert("publisher2".into(), ValidatorId::try_from("0x2054b0c1339309597ad04ba47f4590f8cdb4e305").expect("failed to parse id"));
-        ids.insert("creator".into(), ValidatorId::try_from("0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359").expect("failed to parse id"));
+        ids.insert("creator".into(), ValidatorId::try_from("0x033ed90e0fec3f3ea1c9b005c724d704501e0196").expect("failed to parse id"));
         ids.insert("tester".into(), ValidatorId::try_from("0x2892f6C41E0718eeeDd49D98D648C789668cA67d").expect("failed to parse id"));
 
         ids

primitives/src/util/tests/prep_db.rs

@@ -7,6 +7,7 @@ edition = "2018"
 [dependencies]
 # Futures
 futures = "0.3.1"
+async-std = "1.4.0"
 # Primitives
 primitives = { path = "../primitives", features = ["postgres"] }
 adapter = { version = "0.1", path = "../adapter" }
@@ -15,17 +16,18 @@ hex = "0.3.2"
 # CLI
 clap = "2.33.0"
 # Server
-tokio = { version = "0.2", features = ["macros"] }
+tokio = { version = "0.2.9", features = ["macros", "rt-core"] }
 hyper = { version = "0.13", features = ["stream"] }
 regex = "1"
 # Database
 redis = { version = "0.14", features = ["tokio-rt-core"] }
 bb8 = { git = "https://github.com/khuey/bb8" }
 bb8-postgres = { git = "https://github.com/khuey/bb8", features = ["with-chrono-0_4", "with-serde_json-1"] }
+
 # Migrations
 migrant_lib = { version = "0.27", features = ["d-postgres"] }
 # Logger
-slog = { version = "^2.2.3" , features = ["max_level_trace"] }
+slog = { version = "^2.2.3", features = ["max_level_trace"] }
 # Serde
 serde = { version = "^1.0", features = ['derive'] }
 serde_json = "^1.0"

sentry/Cargo.toml

@@ -1,2 +1,3 @@
 -- This file should undo anything in `up.sql`
-DROP TABLE event_aggregates, validator_messages, channels;
+DROP AGGREGATE jsonb_object_agg(jsonb);
+DROP TABLE event_aggregates, validator_messages, channels;

sentry/migrations/20190806011140_initial-tables/down.sql

@@ -0,0 +1,3 @@
+DELETE FROM event_aggregates;
+DELETE FROM validator_messages;
+DELETE FROM channels;

sentry/migrations/20190806011140_initial-tables/seed/down.sql

@@ -0,0 +1,11 @@
+INSERT INTO 
+channels 
+VALUES 
+(
+    '0x061d5e2a67d0a9a10f1c732bca12a676d83f79663a396f7d87b3e30b9b411088', 
+    '0x033ed90e0fec3f3ea1c9b005c724d704501e0196', 
+    '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359', 
+    '1000',
+    to_timestamp(4102444800000),
+    '{"minPerImpression":"1","maxPerImpression":"10","pricingBounds":{"CLICK":{"min":"0","max":"0"}},"withdrawPeriodStart":4073414400000,"validators":[{"id":"0xce07CbB7e054514D590a0262C93070D838bFBA2e","url":"http://localhost:8005","fee":"100"},{"id":"0xC91763D7F14ac5c5dDfBCD012e0D2A61ab9bDED3","url":"http://localhost:8006","fee":"100"}]}'
+);

sentry/migrations/20190806011140_initial-tables/seed/up.sql

@@ -28,8 +28,19 @@ CREATE INDEX idx_validator_messages_msg_state_root ON validator_messages ((msg -
 CREATE TABLE event_aggregates
 (
     channel_id VARCHAR(66)              NOT NULL REFERENCES channels (id) ON DELETE RESTRICT,
-    created    TIMESTAMP WITH TIME ZONE NOT NULL,
-    events     JSONB                    NOT NULL
+    created    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+    event_type VARCHAR(255)             NOT NULL,
+    earner     VARCHAR(255),
+    count      VARCHAR                   NOT NULL,
+    payout     VARCHAR                   NOT NULL
 );
 
 CREATE INDEX idx_event_aggregates_created ON event_aggregates (created);
+CREATE INDEX idx_event_aggregates_channel ON event_aggregates (channel_id);
+CREATE INDEX idx_event_aggregates_event_type ON event_aggregates (event_type);
+
+CREATE AGGREGATE jsonb_object_agg(jsonb) (
+  SFUNC = 'jsonb_concat',
+  STYPE = jsonb,
+  INITCOND = '{}'
+);

sentry/migrations/20190806011140_initial-tables/up.sql

@@ -2,12 +2,13 @@ use chrono::Utc;
 use futures::future::try_join_all;
 use redis::aio::MultiplexedConnection;
 
+use crate::Session;
 use primitives::event_submission::{RateLimit, Rule};
 use primitives::sentry::Event;
 use primitives::Channel;
 use std::cmp::PartialEq;
-
-use crate::Session;
+use std::error;
+use std::fmt;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum Error {
@@ -17,6 +18,19 @@ pub enum Error {
     RulesError(String),
 }
 
+impl error::Error for Error {}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::OnlyCreatorCanCloseChannel => write!(f, "only creator can create channel"),
+            Error::ChannelIsExpired => write!(f, "channel has expired"),
+            Error::ChannelIsInWithdrawPeriod => write!(f, "channel is in withdraw period"),
+            Error::RulesError(error) => write!(f, "{}", error),
+        }
+    }
+}
+
 // @TODO: Make pub(crate)
 pub async fn check_access(
     redis: &MultiplexedConnection,

sentry/src/access.rs

@@ -9,7 +9,7 @@ use lazy_static::lazy_static;
 
 pub mod analytics;
 mod channel;
-mod event_aggregate;
+pub mod event_aggregate;
 mod validator_message;
 
 pub use self::channel::*;
@@ -55,7 +55,7 @@ pub async fn postgres_connection() -> Result<DbPool, bb8_postgres::tokio_postgre
     Pool::builder().build(pg_mgr).await
 }
 
-pub async fn setup_migrations() {
+pub async fn setup_migrations(environment: &str) {
     use migrant_lib::{Config, Direction, Migrator, Settings};
 
     let settings = Settings::configure_postgres()
@@ -82,9 +82,16 @@ pub async fn setup_migrations() {
         };
     }
 
+    let mut migrations = vec![make_migration!("20190806011140_initial-tables")];
+
+    if environment == "development" {
+        // seeds database tables for testing
+        migrations.push(make_migration!("20190806011140_initial-tables/seed"))
+    }
+
     // Define Migrations
     config
-        .use_migrations(&[make_migration!("20190806011140_initial-tables")])
+        .use_migrations(&migrations)
         .expect("Loading migrations failed");
 
     // Reload config, ping the database for applied migrations