Merge branch 'dev' into add-exhausted-property

Author: samparsky

Cargo.lock

@@ -39,7 +39,7 @@ We need two services to be able to run `Sentry`: `Postgres` and `Redis`.
 
 ### Running Redis
 
-`docker run --rm --name adex-validator-redis -d redis`
+`docker run --rm -p 6379:6379 --name adex-validator-redis -d redis`
 
 ### Running Sentry Rest API
 

README.md

@@ -14,7 +14,7 @@ serde = { version = "^1.0", features = ['derive'] }
 serde_json = "1.0"
 serde-hex = "0.1.0"
 # Ethereum
-web3 = { git = "https://github.com/tomusdrw/rust-web3" }
+web3 = { git = "https://github.com/elpiel/rust-web3" }
 eth_checksum = "0.1.1"
 tiny-keccak = "1.5"
 ethstore = { git = "https://github.com/elpiel/openethereum", branch = "remove-dir-depenedency-for-ethstore" }
@@ -31,3 +31,4 @@ async-trait = "0.1.40"
 [dev-dependencies]
 byteorder = "1.3"
 tokio = { version = "0.2", features = ["macros", "rt-threaded"] }
+wiremock = "0.3"

adapter/Cargo.toml

@@ -295,7 +295,6 @@ impl RelayerClient {
     ) -> Result<bool, AdapterError<Error>> {
         use reqwest::Response;
         use std::collections::HashMap;
-
         let relay_url = format!(
             "{}/identity/by-owner/{}",
             self.relayer_url,
@@ -313,7 +312,6 @@ impl RelayerClient {
         let has_privileges = identities_owned
             .get(identity)
             .map_or(false, |privileges| *privileges > 0);
-
         Ok(has_privileges)
     }
 }
@@ -429,12 +427,16 @@ mod test {
     use crate::EthereumChannel;
     use chrono::{Duration, Utc};
     use hex::FromHex;
-    use primitives::adapter::KeystoreOptions;
     use primitives::config::configuration;
     use primitives::ChannelId;
+    use primitives::{adapter::KeystoreOptions, targeting::Rules};
     use primitives::{ChannelSpec, EventSubmission, SpecValidators, ValidatorDesc};
     use std::convert::TryFrom;
     use web3::types::Address;
+    use wiremock::{
+        matchers::{method, path},
+        Mock, MockServer, ResponseTemplate,
+    };
 
     fn setup_eth_adapter(contract_address: Option<[u8; 20]>) -> EthereumAdapter {
         let mut config = configuration("development", None).expect("failed parse config");
@@ -543,12 +545,23 @@ mod test {
     }
 
     #[tokio::test]
-    #[ignore]
     async fn test_session_from_token() {
         use primitives::ToETHChecksum;
+        use std::collections::HashMap;
+
         let identity = ValidatorId::try_from("0x5B04DBc513F90CaAFAa09307Ad5e3C65EB4b26F0").unwrap();
+        let server = MockServer::start().await;
+        let mut identities_owned: HashMap<ValidatorId, u8> = HashMap::new();
+        identities_owned.insert(identity, 2);
 
         let mut eth_adapter = setup_eth_adapter(None);
+
+        Mock::given(method("GET"))
+            .and(path(format!("/identity/by-owner/{}", eth_adapter.whoami())))
+            .respond_with(ResponseTemplate::new(200).set_body_json(&identities_owned))
+            .mount(&server)
+            .await;
+
         eth_adapter.unlock().expect("should unlock eth adapter");
         let wallet = eth_adapter.wallet.clone();
 
@@ -651,13 +664,13 @@ mod test {
             deposit_asset: eth_checksum::checksum(&format!("{:?}", token_contract.address())),
             deposit_amount: 2_000.into(),
             valid_until: Utc::now() + Duration::days(2),
-            targeting_rules: vec![],
+            targeting_rules: Rules::new(),
             spec: ChannelSpec {
                 title: None,
                 validators: SpecValidators::new(leader_validator_desc, follower_validator_desc),
                 max_per_impression: 10.into(),
                 min_per_impression: 10.into(),
-                targeting_rules: vec![],
+                targeting_rules: Rules::new(),
                 event_submission: Some(EventSubmission { allow: vec![] }),
                 created: Utc::now(),
                 active_from: None,

adapter/src/ethereum.rs

@@ -1,12 +1,15 @@
 use crate::{targeting::Rule, BigNum, ValidatorId};
-use chrono::{DateTime, Utc};
+use chrono::{
+    serde::{ts_milliseconds, ts_milliseconds_option},
+    DateTime, Utc,
+};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 /// See [AdEx Protocol adSlot.md][protocol] & [adex-models AdSlot.js][adex-models] for more details.
 /// [protocol]: https://github.com/AdExNetwork/adex-protocol/blob/master/adSlot.md
 /// [adex-models]: https://github.com/AdExNetwork/adex-models/blob/master/src/models/AdSlot.js
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct AdSlot {
     /// valid ipfs hash of spec props below
@@ -32,6 +35,7 @@ pub struct AdSlot {
     /// User address from the session
     pub owner: ValidatorId,
     /// UTC timestamp in milliseconds, used as nonce for escaping duplicated spec ipfs hashes
+    #[serde(with = "ts_milliseconds")]
     pub created: DateTime<Utc>,
     /// the name of the unit used in platform UI
     #[serde(default)]
@@ -45,5 +49,6 @@ pub struct AdSlot {
     #[serde(default)]
     pub archived: bool,
     /// UTC timestamp in milliseconds, changed every time modifiable property is changed
+    #[serde(with = "ts_milliseconds_option")]
     pub modified: Option<DateTime<Utc>>,
 }

primitives/src/ad_slot.rs

@@ -1,4 +1,7 @@
-use chrono::{DateTime, Utc};
+use chrono::{
+    serde::{ts_milliseconds, ts_milliseconds_option},
+    DateTime, Utc,
+};
 use serde::{Deserialize, Serialize};
 
 use crate::{ValidatorId, IPFS};
@@ -25,18 +28,27 @@ pub struct AdUnit {
     /// Advertised URL
     pub target_url: String,
     /// Number; minimum targeting score (optional)
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub min_targeting_score: Option<f64>,
     /// user address from the session
     pub owner: ValidatorId,
     /// number, UTC timestamp in milliseconds, used as nonce for escaping duplicated spec ipfs hashes
+    #[serde(with = "ts_milliseconds")]
     pub created: DateTime<Utc>,
     /// the name of the unit used in platform UI
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub title: Option<String>,
     /// arbitrary text used in platform UI
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
     /// user can change it - used for filtering in platform UI
     #[serde(default)]
     pub archived: bool,
     /// UTC timestamp in milliseconds, changed every time modifiable property is changed
+    #[serde(
+        default,
+        with = "ts_milliseconds_option",
+        skip_serializing_if = "Option::is_none"
+    )]
     pub modified: Option<DateTime<Utc>>,
 }

primitives/src/ad_unit.rs

@@ -8,7 +8,7 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_hex::{SerHex, StrictPfx};
 
-use crate::{targeting::Rule, AdUnit, BigNum, EventSubmission, ValidatorDesc, ValidatorId};
+use crate::{targeting::Rules, AdUnit, BigNum, EventSubmission, ValidatorDesc, ValidatorId};
 use hex::{FromHex, FromHexError};
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Copy, Clone, Hash)]
@@ -96,7 +96,7 @@ pub struct Channel {
     #[serde(with = "ts_seconds")]
     pub valid_until: DateTime<Utc>,
     #[serde(default)]
-    pub targeting_rules: Vec<Rule>,
+    pub targeting_rules: Rules,
     pub spec: ChannelSpec,
     #[serde(default)]
     pub exhausted: Vec<bool>
@@ -187,7 +187,7 @@ pub struct ChannelSpec {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub ad_units: Vec<AdUnit>,
     #[serde(default)]
-    pub targeting_rules: Vec<Rule>,
+    pub targeting_rules: Rules,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
@@ -386,7 +386,7 @@ mod test {
 pub mod postgres {
     use super::ChannelId;
     use super::{Channel, ChannelSpec};
-    use crate::targeting::Rule;
+    use crate::targeting::Rules;
     use bytes::BytesMut;
     use hex::FromHex;
     use postgres_types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
@@ -401,7 +401,7 @@ pub mod postgres {
                 deposit_asset: row.get("deposit_asset"),
                 deposit_amount: row.get("deposit_amount"),
                 valid_until: row.get("valid_until"),
-                targeting_rules: row.get::<_, Json<Vec<Rule>>>("targeting_rules").0,
+                targeting_rules: row.get::<_, Json<Rules>>("targeting_rules").0,
                 spec: row.get::<_, Json<ChannelSpec>>("spec").0,
                 exhausted: row.get("exhausted"),
             }