Merge pull request #227 from samparsky/adex-audit

Make contract calls async

Author: elpiel

Cargo.lock

@@ -24,6 +24,9 @@ ethkey = { version = "0.4.0", git = "https://github.com/paritytech/parity-ethere
 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

@@ -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> {