Merge branch 'aip-61-adex-v5' into remove_create2

Author: simzzz

Cargo.lock

@@ -11,5 +11,5 @@ members = [
     "test_harness",
 ]
 
-[patch.crates-io]
-postgres-types = { git = "https://github.com/elpiel/rust-postgres", branch = "boxed-dyn-ToSql"}
+# [patch.crates-io]
+# postgres-types = { git = "https://github.com/elpiel/rust-postgres", branch = "boxed-dyn-ToSql"}

Cargo.toml

@@ -30,15 +30,15 @@ thiserror = "1"
 
 # Time handling
 chrono = "0.4"
-serde = { version = "^1.0", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 hex = "0.4"
 base64 = "0.13"
-once_cell = "^1.8"
+once_cell = "1.8"
 # Macro for easier derive of Display & FromStr
-parse-display = "^0.5.0"
+parse-display = "0.5"
 
 [dev-dependencies]
-byteorder = "^1.4"
-tokio = { version = "^1", features = ["macros", "rt-multi-thread"] }
+byteorder = "1.4"
+tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 pretty_assertions = "1"

adapter/Cargo.toml

@@ -5,6 +5,10 @@ name = "adview-manager"
 version = "0.1.0"
 license = "AGPL-3.0"
 
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
 [dependencies]
 # Domain
 adex_primitives = { path = "../primitives", package = "primitives", features = [
@@ -13,19 +17,15 @@ adex_primitives = { path = "../primitives", package = "primitives", features = [
 chrono = "0.4"
 num-integer = "0.1"
 # (De)Serialization & Http requests
-serde = { version = "^1.0", features = ["derive"] }
-serde_json = "^1.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
 reqwest = { version = "0.11", features = ["json"] }
-url = { version = "^2.1", features = ["serde"] }
+url = { version = "2", features = ["serde"] }
 # Logging
 log = "0.4"
 # Async
-async-std = "^1.8"
+async-std = "1"
 # Other
-once_cell = "^1.8"
-thiserror = "^1.0"
-rand = "^0.8"
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
+once_cell = "1"
+thiserror = "1"
+rand = "0.8"

adview-manager/Cargo.toml

@@ -10,70 +10,77 @@ authors = [
 edition = "2021"
 license = "AGPL-3.0"
 
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
 [features]
 postgres = ["bytes", "tokio-postgres", "deadpool-postgres"]
 # Enables the testing utilities like addresses, dummy Campaigns, Validators, IPFSes, AdUnits, etc.
 # All Addresses and keystore files exist in the ganache-cli setup for testing with the EthereumAdapter
 test-util = []
 
+[[example]]
+name = "channel_list_query"
+required-features = ["test-util"]
+
+[[example]]
+name = "campaign_list_query"
+required-features = ["test-util"]
+
+[[example]]
+name = "campaign_list_response"
+required-features = ["test-util"]
+
 [dependencies]
 # (De)Serialization
-serde = { version = "^1.0", features = ['derive'] }
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 # TODO: Remove once we change `ChannelId` Serialize impl
-serde-hex = "0.1.0"
-serde_millis = "0.1.1"
+serde-hex = "0.1"
+serde_millis = "0.1"
 # Used prefixes on field for targeting::Input, and `campaign::Active`
-serde_with = "1.9"
+serde_with = "1"
 # Configuration
 toml = "0.5"
 # Logging
-slog = { version = "^2.5.2", features = ["max_level_trace"] }
-slog-term = "^2.4.2"
-slog-async = "^2.3.0"
+slog = { version = "2", features = ["max_level_trace"] }
+slog-term = "2"
+slog-async = "2"
 # Domain
-thiserror = "^1.0"
+thiserror = "1"
 chrono = { version = "0.4", features = ["serde"] }
-# time = "0.1.42"
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1", features = ["v4"] }
 # For encoding the Channel to a ChannelId
-ethabi = "14.0.0"
+ethabi = "17"
 # For the nonce U256
-ethereum-types = "0.11"
+ethereum-types = "0.13"
 # Macro for easier derive of Display & FromStr
-parse-display = "^0.5.0"
+parse-display = "0.5"
 # CID & multihash / multibase
 cid = "0.8"
 hex = "0.4"
-merkletree = "0.10.0"
-tiny-keccak = { version = "^2.0", features = ["keccak"] }
-url = { version = "=2.2", features = ["serde"] }
+merkletree = "0.10"
+tiny-keccak = { version = "2", features = ["keccak"] }
+url = { version = "2", features = ["serde"] }
 # Numbers - BigNum, Numbers, Traits and Derives
 num = { version = "0.4", features = ["serde", "num-bigint"] }
 num-traits = "0.2"
 num-derive = "0.3"
-# Fixtures
-rand = "^0.8"
 # postgres feature
-bytes = { version = "^1", optional = true }
+bytes = { version = "1", optional = true }
 tokio-postgres = { version = "0.7", optional = true, features = [
   "with-chrono-0_4",
   "with-serde_json-1",
 ] }
 # testing FromSql & ToSql implementation of structs
 deadpool-postgres = { version = "0.10", optional = true }
 
-# Futures
-futures = "0.3"
 async-trait = "0.1"
 # Other
-once_cell = "^1.8"
+once_cell = "1"
 
 [dev-dependencies]
 pretty_assertions = "1"
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
-serde_qs = "^0.9"
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
+serde_qs = "0.9"

primitives/Cargo.toml

@@ -0,0 +1,116 @@
+use chrono::{TimeZone, Utc};
+use primitives::{
+    sentry::campaign_list::{CampaignListQuery, ValidatorParam},
+    test_util::{ADVERTISER, FOLLOWER, IDS, LEADER},
+};
+
+fn main() {
+    // Empty query - default values only
+    {
+        let empty_query = "";
+        let query: CampaignListQuery = serde_qs::from_str(empty_query).unwrap();
+
+        assert_eq!(0, query.page);
+        assert!(
+            Utc::now() >= query.active_to_ge,
+            "By default `activeTo` is set to `Utc::now()`"
+        );
+        assert!(query.creator.is_none());
+        assert!(query.validator.is_none());
+    }
+
+    // In the following examples we always use `activeTo`
+    // as it makes simpler examples for assertions rather than using the default `Utc::now()`
+
+    // Query with `activeTo` only
+    {
+        let active_to_query = "activeTo=1624192200";
+        let active_to = CampaignListQuery {
+            page: 0,
+            active_to_ge: Utc.ymd(2021, 6, 20).and_hms(12, 30, 0),
+            creator: None,
+            validator: None,
+        };
+
+        assert_eq!(active_to, serde_qs::from_str(active_to_query).unwrap());
+    }
+
+    // Query with `page` & `activeTo`
+    {
+        let with_page_query = "page=14&activeTo=1624192200";
+        let with_page = CampaignListQuery {
+            page: 14,
+            active_to_ge: Utc.ymd(2021, 6, 20).and_hms(12, 30, 0),
+            creator: None,
+            validator: None,
+        };
+
+        assert_eq!(with_page, serde_qs::from_str(with_page_query).unwrap());
+    }
+
+    // Query with `creator`
+    {
+        let with_creator_query =
+            "activeTo=1624192200&creator=0xDd589B43793934EF6Ad266067A0d1D4896b0dff0";
+
+        let with_creator = CampaignListQuery {
+            page: 0,
+            active_to_ge: Utc.ymd(2021, 6, 20).and_hms(12, 30, 0),
+            creator: Some(*ADVERTISER),
+            validator: None,
+        };
+
+        assert_eq!(
+            with_creator,
+            serde_qs::from_str(with_creator_query).unwrap()
+        );
+    }
+
+    // Query with `validator`
+    // You can either have `leader` or `validator` but not both!
+    {
+        let with_creator_validator_query =
+            "activeTo=1624192200&validator=0xf3f583AEC5f7C030722Fe992A5688557e1B86ef7";
+        let with_creator_validator = CampaignListQuery {
+            page: 0,
+            active_to_ge: Utc.ymd(2021, 6, 20).and_hms(12, 30, 0),
+            creator: None,
+            validator: Some(ValidatorParam::Validator(IDS[&FOLLOWER])),
+        };
+
+        assert_eq!(
+            with_creator_validator,
+            serde_qs::from_str(with_creator_validator_query).unwrap()
+        );
+    }
+
+    // Query with `leader`
+    // You can either have `leader` or `validator` but not both!
+    {
+        let with_leader_query =
+            "activeTo=1624192200&leader=0x80690751969B234697e9059e04ed72195c3507fa";
+
+        let with_leader = CampaignListQuery {
+            page: 0,
+            active_to_ge: Utc.ymd(2021, 6, 20).and_hms(12, 30, 0),
+            creator: None,
+            validator: Some(ValidatorParam::Leader(IDS[&LEADER])),
+        };
+
+        assert_eq!(with_leader, serde_qs::from_str(with_leader_query).unwrap());
+    }
+
+    // Query with all parameters and `validator`
+    // You can either have `leader` or `validator` but not both!
+    {
+        let full_query = "page=14&activeTo=1624192200&creator=0xDd589B43793934EF6Ad266067A0d1D4896b0dff0&validator=0xf3f583AEC5f7C030722Fe992A5688557e1B86ef7";
+        let full_expected = CampaignListQuery {
+            page: 14,
+            active_to_ge: Utc.ymd(2021, 6, 20).and_hms(12, 30, 0),
+            creator: Some(*ADVERTISER),
+            validator: Some(ValidatorParam::Validator(IDS[&FOLLOWER])),
+        };
+
+        assert_eq!(full_expected, serde_qs::from_str(full_query).unwrap());
+    }
+}