Merge pull request #1327 from golemfactory/mf/actix-0.1x

Bump ya-sb-router and actix to 0.10
golemfactory · May 24, 2021 · 93bd291 · 93bd291
2 parents 14de663 + f23c201
commit 93bd291
Show file tree

Hide file tree

Showing 12 changed files with 770 additions and 865 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -172,10 +172,10 @@ ya-service-api-interfaces = { path = "core/serv-api/interfaces" }
 ya-service-api-web = { path = "core/serv-api/web" }
 
 ## SERVICE BUS
-#ya-service-bus = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "b59a415ca00aecf83cf3df78fe032ee067344620"}
-#ya-sb-proto = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "b59a415ca00aecf83cf3df78fe032ee067344620"}
-#ya-sb-router = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "b59a415ca00aecf83cf3df78fe032ee067344620"}
-#ya-sb-util = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "b59a415ca00aecf83cf3df78fe032ee067344620"}
+ya-service-bus = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "fe78d2f49986ff45152555866cca46d212d437f6"}
+ya-sb-proto = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "fe78d2f49986ff45152555866cca46d212d437f6"}
+ya-sb-router = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "fe78d2f49986ff45152555866cca46d212d437f6"}
+ya-sb-util = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = "fe78d2f49986ff45152555866cca46d212d437f6"}
 
 ## CLIENT
 #ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "fded326374f6fd92c7c523c4e35494cd4c701e41" }

diff --git a/core/payment-driver/base/Cargo.toml b/core/payment-driver/base/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 default = []
 
 [dependencies]
-actix = { version = "0.9", default-features = false }
+actix = { version = "0.10", default-features = false }
 anyhow = "1.0"
 async-trait = "0.1"
 bigdecimal = { version = "0.2" }

diff --git a/core/payment-driver/dummy/Cargo.toml b/core/payment-driver/dummy/Cargo.toml
@@ -13,7 +13,7 @@ ya-persistence = "0.2"
 ya-service-api-interfaces = "0.1"
 ya-service-bus = "0.4"
 
-actix = { version = "0.9", default-features = false }
+actix = { version = "0.10", default-features = false }
 anyhow = "1.0"
 bigdecimal = "0.2"
 chrono = { version = "0.4", features = ["serde"] }

diff --git a/core/payment-driver/gnt/Cargo.toml b/core/payment-driver/gnt/Cargo.toml
@@ -12,7 +12,7 @@ ya-service-api-interfaces = "0.1"
 ya-service-bus = "0.4"
 ya-utils-networking = "0.1"
 
-actix = { version = "0.9", default-features = false }
+actix = { version = "0.10", default-features = false }
 actix-connect="2.0"
 actix-http="2.2"
 actix-rt = "1.1"

diff --git a/core/serv-api/web/examples/auth_middleware.rs b/core/serv-api/web/examples/auth_middleware.rs
@@ -91,7 +91,7 @@ async fn main() -> anyhow::Result<()> {
                 }
                 ClientCommand::Request { key } => {
                     let mut resp = Client::default()
-                        .get(rest_api_url().into_string())
+                        .get(rest_api_url().to_string())
                         .header(header::AUTHORIZATION, key)
                         .send()
                         .map_err(map_err)

diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ya-exe-unit"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
@@ -31,12 +31,12 @@ ya-agreement-utils = { version = "^0.2"}
 ya-client-model = "0.3"
 ya-compile-time-utils = "0.1"
 ya-core-model = { version = "^0.3", features = ["activity", "appkey"] }
-ya-runtime-api = { version = "0.2", path = "runtime-api", features = ["server"] }
+ya-runtime-api = { version = "0.3", path = "runtime-api", features = ["server"] }
 ya-service-bus = "0.4"
 ya-transfer = "0.1"
 ya-utils-path = "0.1"
 
-actix = { version = "0.9", default-features = false }
+actix = { version = "0.10", default-features = false }
 anyhow = "1.0.19"
 async-trait = "0.1.24"
 chrono = "0.4.10"
@@ -61,12 +61,12 @@ signal-hook = { version = "0.1.13", features = ["tokio-support"] }
 structopt = "0.3"
 thiserror = "1.0.10"
 tokio = { version = "0.2.11", features = ["process", "signal", "time"] }
-tokio-util = { version = "0.2", features = ["codec"] }
+tokio-util = { version = "0.3", features = ["codec"] }
 url = "2.1.1"
 yansi = "0.5.0"
 
 [dev-dependencies]
-ya-runtime-api = { version = "0.2", path = "runtime-api", features = ["codec", "server"] }
+ya-runtime-api = { version = "0.3", path = "runtime-api", features = ["codec", "server"] }
 ya-sb-router = "0.4"
 
 actix-files = "0.4"

diff --git a/exe-unit/runtime-api/Cargo.toml b/exe-unit/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ya-runtime-api"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
@@ -27,7 +27,7 @@ prost = { version = "0.6.1", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "0.2" , optional = true, features=["io-std", "rt-core", "rt-util", "process", "sync"] }
-tokio-util = { version = "0.2", optional = true, features = ["codec"] }
+tokio-util = { version = "0.3", optional = true, features = ["codec"] }
 
 [build-dependencies]
 prost-build = "0.6.1"

diff --git a/exe-unit/runtime-api/src/server/codec.rs b/exe-unit/runtime-api/src/server/codec.rs
@@ -35,11 +35,10 @@ impl<M: Message> Codec<M> {
     }
 }
 
-impl<M: Message> Encoder for Codec<M> {
-    type Item = M;
+impl<M: Message> Encoder<M> for Codec<M> {
     type Error = anyhow::Error;
 
-    fn encode(&mut self, item: Self::Item, dst: &mut BytesMut) -> Result<(), Self::Error> {
+    fn encode(&mut self, item: M, dst: &mut BytesMut) -> Result<(), Self::Error> {
         let len = item.encoded_len();
         dst.reserve(len + prost::length_delimiter_len(len));
         Message::encode_length_delimited(&item, dst)?;

diff --git a/exe-unit/src/handlers/local.rs b/exe-unit/src/handlers/local.rs
@@ -168,12 +168,12 @@ impl<R: Runtime> Handler<Initialize> for ExeUnit<R> {
             Ok(())
         });
 
-        Box::new(fut)
+        Box::pin(fut)
     }
 
     #[cfg(not(feature = "sgx"))]
     fn handle(&mut self, _: Initialize, _: &mut Context<Self>) -> Self::Result {
-        Box::new(futures::future::ok(()).into_actor(self))
+        Box::pin(futures::future::ok(()).into_actor(self))
     }
 }
 

diff --git a/utils/process/Cargo.toml b/utils/process/Cargo.toml
@@ -9,7 +9,7 @@ default = []
 lock = ["fs2"]
 
 [dependencies]
-actix = { version = "0.9", default-features = false }
+actix = { version = "0.10", default-features = false }
 anyhow = "1.0"
 derive_more = "0.99.5"
 futures = "0.3"

diff --git a/utils/transfer/Cargo.toml b/utils/transfer/Cargo.toml
@@ -16,7 +16,8 @@ gftp = { version = "^0.2"}
 actix-http = "2.2"
 actix-rt = "1.1"
 awc = { version = "2.0", features = ["openssl"] }
-async-compression = { version = "0.3.5", features = ["stream", "bzip2", "gzip", "xz"] }
+# async-compression 0.3.8+ deprecates the "stream" module
+async-compression = { version = "=0.3.7", features = ["stream", "bzip2", "gzip", "xz"] }
 bytes = "0.5.4"
 futures = "0.3.4"
 globset = "0.4.5"