Merge pull request #226 from AdExNetwork/update-dependencies

samparsky · web-flow · commit 760e70cabd23 · 2019-12-21T07:52:10.000+01:00
Update and clean up dependencies
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/adapter/Cargo.toml b/adapter/Cargo.toml
@@ -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
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -8,8 +8,6 @@ edition = "2018"
 postgres = ["postgres-types", "bytes", "tokio-postgres"]
 
 [dependencies]
-# Futures
-futures-preview = { version = "=0.3.0-alpha.19", features = ["compat"]}
 # (De)Serialization
 serde = { version = "^1.0", features = ['derive'] }
 serde_json = "1.0"
@@ -35,11 +33,11 @@ num-traits = "0.2"
 num-derive = "0.2"
 # Fixtures
 fake = { version = "^1.3", features = ["chrono"] }
-rand = { version = "^0.6" }
+rand = "^0.6"
 # postgres feature
-postgres-types = {version = "0.1.0-alpha.1", optional = true}
-bytes = { version = "0.4.12", optional = true}
-tokio-postgres = {version = "0.5.0-alpha.1", optional = true, features = ["with-chrono-0_4", "with-serde_json-1"]}
+postgres-types = { version = "0.1.0-alpha.2", optional = true }
+bytes = { version = "0.5", optional = true }
+tokio-postgres = { version = "0.5.0-alpha.2", optional = true, features = ["with-chrono-0_4", "with-serde_json-1"] }
 
 # Other
 lazy_static = "1.4.0"
diff --git a/primitives/src/validator.rs b/primitives/src/validator.rs
@@ -1,7 +1,4 @@
-use std::pin::Pin;
-
 use chrono::{DateTime, Utc};
-use futures::prelude::*;
 use serde::{Deserialize, Serialize};
 use serde_hex::{SerHex, StrictPfx};
 use std::fmt;
@@ -17,8 +14,6 @@ pub enum ValidatorError {
     InvalidTransition,
 }
 
-pub type ValidatorFuture<T> = Pin<Box<dyn Future<Output = Result<T, ValidatorError>> + Send>>;
-
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[serde(transparent)]
 pub struct ValidatorId(#[serde(with = "SerHex::<StrictPfx>")] [u8; 20]);
diff --git a/sentry/Cargo.toml b/sentry/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 # Futures
-futures-preview = { version = "=0.3.0-alpha.19", features = ["compat"]}
+futures = "0.3.1"
 # Primitives
 primitives = { path = "../primitives", features = ["postgres"] }
 adapter = { version = "0.1", path = "../adapter" }
@@ -15,11 +15,11 @@ hex = "0.3.2"
 # CLI
 clap = "2.33.0"
 # Server
-tokio = "0.2.0-alpha.6"
-hyper = { version = "=0.13.0-alpha.4", features = ["unstable-stream"] }
+tokio = { version = "0.2", features = ["macros"] }
+hyper = { version = "0.13", features = ["stream"] }
 regex = "1"
 # Database
-redis = { version = "0.13.1-alpha.0", features = ["tokio-executor"] }
+redis = { version = "0.13.1-alpha.0", features = ["tokio-rt-core"] }
 bb8 = { git = "https://github.com/djc/bb8", branch = "async-await" }
 bb8-postgres = { git = "https://github.com/djc/bb8", branch = "async-await", features = ["with-chrono-0_4", "with-serde_json-1"] }
 # Migrations
diff --git a/sentry/src/routes/channel.rs b/sentry/src/routes/channel.rs
@@ -4,7 +4,6 @@ use crate::success_response;
 use crate::Application;
 use crate::ResponseError;
 use crate::RouteParams;
-use futures::TryStreamExt;
 use hex::FromHex;
 use hyper::{Body, Request, Response};
 use primitives::adapter::Adapter;
@@ -36,7 +35,7 @@ pub async fn create_channel<A: Adapter>(
     req: Request<Body>,
     app: &Application<A>,
 ) -> Result<Response<Body>, ResponseError> {
-    let body = req.into_body().try_concat().await?;
+    let body = hyper::body::to_bytes(req.into_body()).await?;
 
     let channel = serde_json::from_slice::<Channel>(&body)?;
 
diff --git a/validator_worker/Cargo.toml b/validator_worker/Cargo.toml
@@ -28,7 +28,7 @@ reqwest = "0.9.18"
 # Configuration
 lazy_static = "1.3"
 # (De)Serialization
-serde = { version = "^1.0", features = ['derive'] }
+serde = { version = "^1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = "0.5"
 # CLI
diff --git a/validator_worker/src/main.rs b/validator_worker/src/main.rs
@@ -121,16 +121,15 @@ fn run<A: Adapter + 'static>(
     is_single_tick: bool,
     sentry_url: &str,
     config: &Config,
-    adapter: A,
+    mut adapter: A,
 ) -> Result<(), Box<dyn Error>> {
-    let mut sentry_adapter = adapter.clone();
     // unlock adapter
-    sentry_adapter.unlock()?;
+    adapter.unlock()?;
 
     let args = Args {
         sentry_url: sentry_url.to_owned(),
         config: config.to_owned(),
-        adapter: sentry_adapter,
+        adapter,
     };
 
     if is_single_tick {
