Merge branch 'dev' into runtime-issues-221-220-218

Author: elpiel

.gitignore

@@ -4,4 +4,5 @@ target
 *.iml
 .idea
 .old
-Migrant.toml
+Migrant.toml
+node_modules/

.travis.yml

@@ -1,6 +1,8 @@
 language: rust
 rust:
   - stable
+# add nodejs for ganche-cli
+node_js: "12.12.0"
 # Need to cache the whole `.cargo` directory to keep .crates.toml for
 # cargo-update to work
 cache:

Cargo.lock

@@ -6,8 +6,6 @@ edition = "2018"
 
 [dependencies]
 primitives = {path = "../primitives"}
-# Futures
-futures-preview = {version = "=0.3.0-alpha.19"}
 # Time handling
 chrono = "0.4"
 # To/From Hex
@@ -16,16 +14,19 @@ 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/samparsky/rust-web3" }
 eth_checksum = "0.1.1"
-ethabi = "8.0.1"
+ethabi = { git = "https://github.com/samparsky/ethabi", branch = "graph-patches" }
 tiny-keccak = "1.5"
-parity-crypto = { version = "0.4.2", features = ["publickey"], git = "https://github.com/paritytech/parity-common" }
+parity-crypto = { version = "0.4.2", features = ["publickey"] }
 ethstore = { version = "0.2.1", git = "https://github.com/paritytech/parity-ethereum"}
 ethkey = { version = "0.4.0", git = "https://github.com/paritytech/parity-ethereum"}
 sha2 = "0.8.0"
 base64 = "0.10.1"
 lazy_static = "1.4.0"
+# Futures
+futures = { version = "0.3.1", features = ["compat"] }
 
 [dev-dependencies]
-byteorder = "1.3"
+byteorder = "1.3"
+tokio = { version = "0.2", features = ["macros", "rt-core"] }

adapter/Cargo.toml

@@ -0,0 +1,5 @@
+[tasks.pre-test]
+script = [
+    "npm install",
+    "../scripts/ethereum.sh"
+]

adapter/Makefile.toml

@@ -1,3 +1,4 @@
+use futures::future::BoxFuture;
 use primitives::adapter::{Adapter, AdapterError, AdapterResult, DummyAdapterOptions, Session};
 use primitives::channel_validator::ChannelValidator;
 use primitives::config::Config;
@@ -63,29 +64,33 @@ impl Adapter for DummyAdapter {
         Ok(is_same)
     }
 
-    fn validate_channel(&self, channel: &Channel) -> AdapterResult<bool> {
-        match DummyAdapter::is_channel_valid(&self.config, self.whoami(), channel) {
-            Ok(_) => Ok(true),
-            Err(e) => Err(AdapterError::InvalidChannel(e.to_string())),
-        }
+    fn validate_channel<'a>(&'a self, channel: &'a Channel) -> BoxFuture<'a, AdapterResult<bool>> {
+        Box::pin(async move {
+            match DummyAdapter::is_channel_valid(&self.config, self.whoami(), channel) {
+                Ok(_) => Ok(true),
+                Err(e) => Err(AdapterError::InvalidChannel(e.to_string())),
+            }
+        })
     }
 
-    fn session_from_token(&self, token: &str) -> AdapterResult<Session> {
-        let identity = self
-            .authorization_tokens
-            .iter()
-            .find(|(_, id)| *id == token);
+    fn session_from_token<'a>(&'a self, token: &'a str) -> BoxFuture<'a, AdapterResult<Session>> {
+        Box::pin(async move {
+            let identity = self
+                .authorization_tokens
+                .iter()
+                .find(|(_, id)| *id == token);
 
-        match identity {
-            Some((id, _)) => Ok(Session {
-                uid: self.session_tokens[id].clone(),
-                era: 0,
-            }),
-            None => Err(AdapterError::Authentication(format!(
-                "no session token for this auth: {}",
-                token
-            ))),
-        }
+            match identity {
+                Some((id, _)) => Ok(Session {
+                    uid: self.session_tokens[id].clone(),
+                    era: 0,
+                }),
+                None => Err(AdapterError::Authentication(format!(
+                    "no session token for this auth: {}",
+                    token
+                ))),
+            }
+        })
     }
 
     fn get_auth(&self, _validator: &ValidatorId) -> AdapterResult<String> {