Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump ya-sb-router and actix to 0.10 #1327

Merged
merged 6 commits into from
May 24, 2021
Merged

Bump ya-sb-router and actix to 0.10 #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
268cbe1
actix 0.10
mfranciszkiewicz May 17, 2021
644a4fd
ya-service-bus dependency update
mfranciszkiewicz May 19, 2021
ba0f308
fixed version of `async-compression`
mfranciszkiewicz May 19, 2021
79502fc
Deprecated fn fix for auth middleware example
mfranciszkiewicz May 19, 2021
d4f4c85
async-compression comment for Cargo.toml
mfranciszkiewicz May 20, 2021
f23c201
bump exe-unit patch version
mfranciszkiewicz May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,591 changes: 748 additions & 843 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to release ya-service-bus to crates.io before Patch.7 release

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to decrease verbosity of the new GSB

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" }
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/base/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/dummy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/gnt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/serv-api/web/examples/auth_middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions exe-unit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions exe-unit/runtime-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ya-runtime-api"
version = "0.2.1"
version = "0.3.0"
mfranciszkiewicz marked this conversation as resolved.
Show resolved Hide resolved
authors = ["Golem Factory <contact@golem.network>"]
edition = "2018"

Expand All @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions exe-unit/runtime-api/src/server/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
Expand Down
4 changes: 2 additions & 2 deletions exe-unit/src/handlers/local.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}

Expand Down
2 changes: 1 addition & 1 deletion utils/process/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion utils/transfer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down