Issue #18 .await syntax (#144)

* update toolchain to nightly and fix `cargo clippy` installation error

* fix clippy errors

* update to `.await` and fix cargo errors/warnings

* clean up some files

* Clean up some files and some not needed dependencies

* update .travis.yml to use latest nightly

* follower - merge fix for `.await`

* fix cargo fmt

* cargo-make 0.22.2 fixes the installation of clippy so remove the custom task override

* update `futures-preview` to `alpha.19`

* adapter - fix `clippy` warning

* enable build failure on a `clippy` warning

Author: elpiel

.env.dist

@@ -1,6 +1,6 @@
 language: rust
 rust:
-  - nightly-2019-05-08
+  - nightly
 cache: cargo
 env:
   global:

.travis.yml

@@ -3,7 +3,7 @@
 members = [
     "adapter",
     "primitives",
-     "validator_worker",
-     # "sentry",
-     "adview-manager",
+    "validator_worker",
+    # "sentry",
+    "adview-manager",
 ]

Cargo.lock

@@ -1,6 +1,6 @@
 [env]
 CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = "true"
-CARGO_MAKE_CLIPPY_ARGS = "--all-features"
+CARGO_MAKE_CLIPPY_ARGS = "--all-features -- -D warnings"
 
 [tasks.dev-test-flow]
 dependencies = [

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 primitives = {path = "../primitives"}
 # Futures
-futures-preview = {version = "=0.3.0-alpha.16"}
+futures-preview = {version = "=0.3.0-alpha.19"}
 # Time handling
 chrono = "0.4"
 time = "0.1.42"

Makefile.toml

@@ -1,3 +1,7 @@
+#![deny(rust_2018_idioms)]
+#![deny(clippy::all)]
+#![deny(clippy::match_bool)]
+
 use std::error::Error;
 
 use chrono::{DateTime, Utc};
@@ -119,7 +123,7 @@ impl EthereumChannel {
             ));
         }
 
-        if let Err(_) = BigNum::try_from(token_amount) {
+        if BigNum::try_from(token_amount).is_err() {
             return Err(ChannelError::InvalidArgument("invalid token amount".into()));
         }
 

adapter/Cargo.toml

@@ -44,7 +44,7 @@ pub struct AdViewManagerOptions {
 impl AdViewManagerOptions {
     pub fn size(&self) -> Option<(u64, u64)> {
         self.width
-            .and_then(|width| self.height.and_then(|height| Some((width, height))))
+            .and_then(|width| self.height.map(|height| (width, height)))
     }
 }
 

adapter/src/lib.rs

@@ -4,12 +4,9 @@ version = "0.1.0"
 authors = ["Lachezar Lechev <[email protected]>, Omidiora Samuel <[email protected]>"]
 edition = "2018"
 
-[features]
-
-
 [dependencies]
 # Futures
-futures-preview = { version = "=0.3.0-alpha.16", features = ["compat", "io-compat"]}
+futures-preview = { version = "=0.3.0-alpha.19", features = ["compat"]}
 # (De)Serialization
 serde = { version = "^1.0", features = ['derive'] }
 serde_json = "1.0"

adview-manager/src/lib.rs

@@ -18,20 +18,14 @@ pub mod targeting_tag;
 pub mod util;
 pub mod validator;
 
-//#[cfg(any(test, feature = "fixtures"))]
-//pub use util::tests as test_util;
-//
-//pub use self::asset::Asset;
 pub use self::ad_unit::AdUnit;
 pub use self::balances_map::BalancesMap;
 pub use self::big_num::BigNum;
 pub use self::channel::{Channel, ChannelSpec, SpecValidator, SpecValidators};
 pub use self::config::Config;
 pub use self::event_submission::EventSubmission;
-pub use self::validator::ValidatorDesc;
-//#[cfg(feature = "repositories")]
-//pub use self::repository::*;
 pub use self::targeting_tag::TargetingTag;
+pub use self::validator::ValidatorDesc;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum DomainError {