Merge pull request #179 from samparsky/fix-get-auth

Fix get auth

Author: elpiel

Cargo.lock

@@ -88,7 +88,7 @@ impl Adapter for DummyAdapter {
         }
     }
 
-    fn get_auth(&mut self, _validator: &ValidatorId) -> AdapterResult<String> {
+    fn get_auth(&self, _validator: &ValidatorId) -> AdapterResult<String> {
         let who = self
             .session_tokens
             .iter()

adapter/src/dummy.rs

@@ -11,7 +11,6 @@ use primitives::{
 };
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::error::Error;
 use std::fs;
@@ -38,8 +37,6 @@ pub struct EthereumAdapter {
     keystore_json: Value,
     keystore_pwd: Password,
     config: Config,
-    // Auth tokens that we've generated to authenticate with someone (address => token)
-    authorization_tokens: HashMap<String, String>,
     wallet: Option<SafeAccount>,
 }
 
@@ -70,7 +67,6 @@ impl EthereumAdapter {
             address,
             keystore_json,
             keystore_pwd: opts.keystore_pwd.into(),
-            authorization_tokens: HashMap::new(),
             wallet: None,
             config: config.to_owned(),
         })
@@ -227,33 +223,22 @@ impl Adapter for EthereumAdapter {
         Ok(sess)
     }
 
-    fn get_auth(&mut self, validator_id: &ValidatorId) -> AdapterResult<String> {
-        let validator = validator_id.to_owned();
-        match (
-            &self.wallet,
-            self.authorization_tokens.get(&validator.to_string()),
-        ) {
-            (Some(_), Some(token)) => Ok(token.to_owned()),
-            (Some(wallet), None) => {
-                let era = Utc::now().timestamp_millis() as f64 / 60000.0;
-                let payload = Payload {
-                    id: validator.to_hex_checksummed_string(),
-                    era: era.floor() as i64,
-                    identity: None,
-                    address: self.whoami().to_hex_checksummed_string(),
-                };
-                let token = ewt_sign(wallet, &self.keystore_pwd, &payload)
-                    .map_err(|_| map_error("Failed to sign token"))?;
-
-                self.authorization_tokens
-                    .insert(validator.to_string(), token.clone());
-
-                Ok(token)
-            }
-            (_, _) => Err(AdapterError::Configuration(
-                "failed to unlock wallet".to_string(),
-            )),
-        }
+    fn get_auth(&self, validator: &ValidatorId) -> AdapterResult<String> {
+        let wallet = self
+            .wallet
+            .as_ref()
+            .ok_or_else(|| AdapterError::Configuration("unlock wallet".to_string()))?;
+
+        let era = Utc::now().timestamp_millis() as f64 / 60000.0;
+        let payload = Payload {
+            id: validator.to_hex_checksummed_string(),
+            era: era.floor() as i64,
+            identity: None,
+            address: self.whoami().to_hex_checksummed_string(),
+        };
+
+        ewt_sign(&wallet, &self.keystore_pwd, &payload)
+            .map_err(|_| map_error("Failed to sign token"))
     }
 }
 

adapter/src/ethereum.rs

@@ -59,7 +59,7 @@ pub struct Session {
     pub uid: ValidatorId,
 }
 
-pub trait Adapter: ChannelValidator + Send + Clone + Debug {
+pub trait Adapter: ChannelValidator + Send + Sync + Clone + Debug {
     /// Unlock adapter
     fn unlock(&mut self) -> AdapterResult<()>;
 
@@ -84,5 +84,5 @@ pub trait Adapter: ChannelValidator + Send + Clone + Debug {
     fn session_from_token(&self, token: &str) -> AdapterResult<Session>;
 
     /// Gets authentication for specific validator
-    fn get_auth(&mut self, validator_id: &ValidatorId) -> AdapterResult<String>;
+    fn get_auth(&self, validator_id: &ValidatorId) -> AdapterResult<String>;
 }

primitives/src/adapter.rs

@@ -23,7 +23,6 @@ futures-preview = { version = "=0.3.0-alpha.19", features = ["compat"]}
 futures_legacy = { version = "0.1.20", package = "futures" }
 # Concurrency
 tokio = { version = "=0.1.19" }
-async-std = "^0.99.10"
 # API client
 reqwest = "0.9.18"
 # Configuration

validator_worker/Cargo.toml

@@ -64,9 +64,7 @@ async fn on_new_state<'a, A: Adapter + 'static>(
         return Ok(on_error(&iface, &new_state, InvalidNewState::RootHash).await);
     }
 
-    let adapter = iface.adapter.read().await.clone();
-
-    if !adapter.verify(
+    if !iface.adapter.verify(
         &iface.channel.spec.validators.leader().id,
         &proposed_state_root,
         &new_state.signature,
@@ -84,7 +82,7 @@ async fn on_new_state<'a, A: Adapter + 'static>(
         return Ok(on_error(&iface, &new_state, InvalidNewState::Transition).await);
     }
 
-    let signature = adapter.sign(&new_state.state_root)?;
+    let signature = iface.adapter.sign(&new_state.state_root)?;
     let health_threshold = u64::from(iface.config.health_threshold_promilles).into();
     let health = is_healthy(
         &iface.channel,

validator_worker/src/follower.rs

@@ -23,7 +23,7 @@ async fn send_heartbeat<A: Adapter + 'static>(iface: &SentryApi<A>) -> Result<()
     let state_root_raw = get_signable_state_root(&iface.channel.id, &merkle_tree.root())?;
     let state_root = hex::encode(state_root_raw);
 
-    let signature = iface.adapter.read().await.sign(&state_root)?;
+    let signature = iface.adapter.sign(&state_root)?;
 
     let message_types = MessageTypes::Heartbeat(Heartbeat {
         signature,

validator_worker/src/heartbeat.rs

@@ -25,7 +25,7 @@ async fn on_new_accounting<A: Adapter + 'static>(
     let state_root_raw = get_state_root_hash(&iface, &balances)?;
     let state_root = hex::encode(state_root_raw);
 
-    let signature = iface.adapter.read().await.sign(&state_root)?;
+    let signature = iface.adapter.sign(&state_root)?;
 
     iface
         .propagate(&[&MessageTypes::NewState(NewState {

validator_worker/src/leader.rs

@@ -44,12 +44,10 @@ mod test {
     use super::*;
 
     use adapter::DummyAdapter;
-    use async_std::sync::RwLock;
     use primitives::adapter::DummyAdapterOptions;
     use primitives::config::configuration;
     use primitives::util::tests::prep_db::{AUTH, DUMMY_CHANNEL, IDS};
     use primitives::{BalancesMap, Channel};
-    use std::sync::Arc;
 
     fn setup_iface(channel: &Channel) -> SentryApi<DummyAdapter> {
         let adapter_options = DummyAdapterOptions {
@@ -61,14 +59,7 @@ mod test {
         let dummy_adapter = DummyAdapter::init(adapter_options, &config);
         let whoami = dummy_adapter.whoami().clone();
 
-        SentryApi::init(
-            Arc::new(RwLock::new(dummy_adapter)),
-            &channel,
-            &config,
-            false,
-            &whoami,
-        )
-        .expect("should succeed")
+        SentryApi::init(dummy_adapter, &channel, &config, false, &whoami).expect("should succeed")
     }
 
     #[test]

validator_worker/src/lib.rs

@@ -4,7 +4,6 @@
 use clap::{App, Arg};
 
 use adapter::{AdapterTypes, DummyAdapter, EthereumAdapter};
-use async_std::sync::RwLock;
 use futures::compat::Future01CompatExt;
 use futures::future::try_join_all;
 use futures::future::{join, FutureExt, TryFutureExt};
@@ -15,7 +14,6 @@ use primitives::{Channel, SpecValidator, ValidatorId};
 use std::convert::TryFrom;
 use std::error::Error;
 use std::ops::Add;
-use std::sync::Arc;
 use std::time::{Duration, Instant};
 use tokio::timer::Delay;
 use tokio::util::FutureExt as TokioFutureExt;
@@ -26,7 +24,7 @@ use validator_worker::{all_channels, follower, leader, SentryApi};
 struct Args<A: Adapter> {
     sentry_url: String,
     config: Config,
-    adapter: Arc<RwLock<A>>,
+    adapter: A,
     whoami: ValidatorId,
 }
 
@@ -71,7 +69,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             Arg::with_name("singleTick")
                 .short("t")
                 .takes_value(false)
-                .help("runs the validator in single-tick mode and exis"),
+                .help("runs the validator in single-tick mode and exit"),
         )
         .get_matches();
 
@@ -126,7 +124,9 @@ fn run<A: Adapter + 'static>(
     config: &Config,
     adapter: A,
 ) -> Result<(), Box<dyn Error>> {
-    let sentry_adapter = Arc::new(RwLock::new(adapter.clone()));
+    let mut sentry_adapter = adapter.clone();
+    // unlock adapter
+    sentry_adapter.unlock()?;
     let whoami = adapter.whoami().to_owned();
 
     let args = Args {
@@ -188,7 +188,7 @@ async fn iterate_channels<A: Adapter + 'static>(args: Args<A>) -> Result<(), ()>
 }
 
 async fn validator_tick<A: Adapter + 'static>(
-    adapter: Arc<RwLock<A>>,
+    adapter: A,
     channel: Channel,
     config: &Config,
     whoami: &ValidatorId,