dependencies

Author: elpiel

.cargo/config

@@ -0,0 +1,3 @@
+[registries]
+parity-common = { index = "https://github.com/paritytech/parity-common" }
+parity-ethereum = { index = "https://github.com/paritytech/parity-ethereum" }

Cargo.lock

@@ -20,8 +20,8 @@ web3 = { git = "https://github.com/tomusdrw/rust-web3" }
 eth_checksum = "0.1.1"
 ethabi = "8.0.1"
 tiny-keccak = "1.5"
-ethkey = { git = "https://github.com/paritytech/parity.git" }
-ethstore = { git = "https://github.com/paritytech/parity.git" }
+parity-crypto = { version = "0.4.2", features = ["publickey"], registry = "parity-common" }
+ethstore = { version = "0.2.1", registry = "parity-ethereum"}
 sha2 = "0.8.0"
 base64 = "0.10.1"
 lazy_static = "1.4.0"

adapter/Cargo.toml

@@ -1,8 +1,10 @@
 use crate::EthereumChannel;
 use chrono::Utc;
-use ethkey::{public_to_address, recover, verify_address, Address, Message, Password, Signature};
 use ethstore::SafeAccount;
 use lazy_static::lazy_static;
+use parity_crypto::publickey::{
+    public_to_address, recover, verify_address, Address, Message, Password, Signature,
+};
 use primitives::{
     adapter::{Adapter, AdapterError, AdapterResult, KeystoreOptions, Session},
     channel_validator::ChannelValidator,

adapter/src/ethereum.rs

@@ -19,7 +19,9 @@ tokio = "0.2.0-alpha.6"
 hyper = {version = "=0.13.0-alpha.4", features = ["unstable-stream"]}
 regex = "1"
 # Database
-redis = {version = "0.13.1-alpha.0", features = ["executor"]}
+redis = {version = "0.13.1-alpha.0"}
+bb8 = {git = "https://github.com/djc/bb8", branch = "async-await"}
+bb8-postgres = {git = "https://github.com/djc/bb8", branch = "async-await"}
 # Logger
 slog = { version = "^2.2.3" , features = ["max_level_trace"] }
 # Serde

sentry/Cargo.toml

@@ -1,6 +1,6 @@
 use chrono::Utc;
 use futures::future::try_join_all;
-use redis::aio::SharedConnection;
+use redis::aio::MultiplexedConnection;
 
 use primitives::event_submission::{RateLimit, Rule};
 use primitives::sentry::Event;
@@ -18,7 +18,7 @@ pub enum Error {
 
 // @TODO: Make pub(crate)
 pub async fn check_access(
-    redis: &SharedConnection,
+    redis: &MultiplexedConnection,
     session: &Session,
     rate_limit: &RateLimit,
     channel: &Channel,
@@ -91,7 +91,7 @@ pub async fn check_access(
 }
 
 async fn apply_rule(
-    redis: SharedConnection,
+    redis: MultiplexedConnection,
     rule: &Rule,
     events: &[Event],
     channel: &Channel,
@@ -164,7 +164,7 @@ mod test {
 
     use super::*;
 
-    async fn setup() -> (Config, SharedConnection) {
+    async fn setup() -> (Config, MultiplexedConnection) {
         let mut redis = redis_connection().await.expect("Couldn't connect to Redis");
         let config = configuration("development", None).expect("Failed to get dev configuration");
 

sentry/src/access.rs

@@ -1,4 +1,4 @@
-use redis::aio::SharedConnection;
+use redis::aio::MultiplexedConnection;
 use redis::RedisError;
 
 use lazy_static::lazy_static;
@@ -8,7 +8,7 @@ lazy_static! {
         std::env::var("REDIS_URL").unwrap_or_else(|_| String::from("redis://127.0.0.1:6379"));
 }
 
-pub async fn redis_connection() -> Result<SharedConnection, RedisError> {
+pub async fn redis_connection() -> Result<MultiplexedConnection, RedisError> {
     let client = redis::Client::open(REDIS_URL.as_str()).expect("Wrong redis connection string");
-    client.get_shared_async_connection().await
+    client.get_multiplexed_async_connection().await
 }

sentry/src/db.rs

@@ -7,7 +7,7 @@ use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Error, Method, Request, Response, Server, StatusCode};
 use primitives::adapter::Adapter;
 use primitives::Config;
-use redis::aio::SharedConnection;
+use redis::aio::MultiplexedConnection;
 use slog::{error, info, Logger};
 
 pub mod middleware {
@@ -40,7 +40,7 @@ pub mod event_reducer;
 pub struct Application<A: Adapter> {
     adapter: A,
     logger: Logger,
-    redis: SharedConnection,
+    redis: MultiplexedConnection,
     _clustered: bool,
     port: u16,
     config: Config,
@@ -51,7 +51,7 @@ impl<A: Adapter + 'static> Application<A> {
         adapter: A,
         config: Config,
         logger: Logger,
-        redis: SharedConnection,
+        redis: MultiplexedConnection,
         clustered: bool,
         port: u16,
     ) -> Self {
@@ -120,7 +120,7 @@ where
 async fn handle_routing(
     req: Request<Body>,
     (adapter, config): (&impl Adapter, &Config),
-    redis: SharedConnection,
+    redis: MultiplexedConnection,
     logger: &Logger,
 ) -> Response<Body> {
     let headers = match cors(&req) {

sentry/src/lib.rs

@@ -2,7 +2,7 @@ use std::error;
 
 use hyper::header::AUTHORIZATION;
 use hyper::{Body, Request};
-use redis::aio::SharedConnection;
+use redis::aio::MultiplexedConnection;
 
 use primitives::adapter::{Adapter, Session as AdapterSession};
 
@@ -13,7 +13,7 @@ use crate::Session;
 pub(crate) async fn for_request(
     mut req: Request<Body>,
     adapter: &impl Adapter,
-    redis: SharedConnection,
+    redis: MultiplexedConnection,
 ) -> Result<Request<Body>, Box<dyn error::Error>> {
     let authorization = req.headers().get(AUTHORIZATION);
 
@@ -90,7 +90,7 @@ mod test {
 
     use super::*;
 
-    async fn setup() -> (DummyAdapter, SharedConnection) {
+    async fn setup() -> (DummyAdapter, MultiplexedConnection) {
         let adapter_options = DummyAdapterOptions {
             dummy_identity: IDS["leader"].clone(),
             dummy_auth: IDS.clone(),