Skip to content

Commit

Permalink
[ci] hyperledger-iroha#2158: Upgrade parity_scale_codec and other d…
Browse files Browse the repository at this point in the history 
…ependencies

Signed-off-by: Aleksandr Petrosyan <[email protected]>
  • Loading branch information
@appetrosyan
appetrosyan committed Aug 7, 2022
1 parent 4422036 commit a3ec0da
Show file tree
Hide file tree
Showing 39 changed files with 510 additions and 420 deletions.
432 changes: 242 additions & 190 deletions Cargo.lock
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ iroha_actor_derive = { version = "=2.0.0-pre-rc.7", path = "derive" }
iroha_logger = { version = "=2.0.0-pre-rc.7", path = "../logger" }
iroha_primitives = { version = "=2.0.0-pre-rc.7", path = "../primitives" }

async-trait = "0.1"
once_cell = "1.8.0"
dashmap = "4"
futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] }
tokio = { version = "1.6.0", features = ["sync", "time", "rt", "rt-multi-thread", "macros"]}
thiserror = "1.0.28"
async-trait = "0.1.57"
once_cell = "1.13.0"
dashmap = "5.3.4"
futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] }
tokio = { version = "1.20.1", features = ["sync", "time", "rt", "rt-multi-thread", "macros"] }
thiserror = "1.0.32"

petgraph = { version = "0.6", default-features = false, optional = true }
derive_more = "0.99.17"
10 changes: 5 additions & 5 deletions actor/derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ edition = "2021"
proc-macro = true

[dependencies]
syn = { version = "1.0" }
quote = "1.0"
proc-macro2 = "1.0"
proc-macro-error = "1.0"
syn = "1.0.99"
quote = "1.0.21"
proc-macro2 = "1.0.43"
proc-macro-error = "1.0.4"

[dev-dependencies]
iroha_actor = { version = "=2.0.0-pre-rc.7", path = "../" }

trybuild = "1.0.53"
trybuild = "1.0.64"
20 changes: 10 additions & 10 deletions cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ iroha_p2p = { version = "=2.0.0-pre-rc.7", path = "../p2p" }
iroha_schema_gen = { version = "=2.0.0-pre-rc.7", path = "../schema/gen", optional = true }
iroha_cli_derive = { version = "=2.0.0-pre-rc.7", path = "derive" }

async-trait = "0.1"
color-eyre = "0.5.11"
eyre = "0.6.5"
futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] }
parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0.28"
tokio = { version = "1.6.0", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs", "signal"] }
warp = "0.3"
async-trait = "0.1.57"
color-eyre = "0.6.2"
eyre = "0.6.8"
futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] }
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
serde = { version = "1.0.142", features = ["derive"] }
serde_json = "1.0.83"
thiserror = "1.0.32"
tokio = { version = "1.20.1", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs", "signal"] }
warp = "0.3.2"
serial_test = "0.8.0"

[dev-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions cli/derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ edition = "2021"
proc-macro = true

[dependencies]
syn = {version = "1", features = ["parsing", "printing", "extra-traits"] }
quote = "1.0"
proc-macro2 = "1.0"
syn = { version = "1.0.99", features = ["parsing", "printing", "extra-traits"] }
quote = "1.0.21"
proc-macro2 = "1.0.43"

[dev-dependencies]
warp = "0.3"
warp = "0.3.2"
32 changes: 16 additions & 16 deletions client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,32 @@ iroha_telemetry = { version ="=2.0.0-pre-rc.7", path = "../telemetry" }
iroha_version = { version = "=2.0.0-pre-rc.7", path = "../version" }
iroha_core = { version = "=2.0.0-pre-rc.7", path = "../core", features = ["dev-telemetry", "telemetry"]}

attohttpc = "0.18"
eyre = "0.6.5"
http = "0.2.1"
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tungstenite = { version = "0.16" }
attohttpc = "0.18.0"
eyre = "0.6.8"
http = "0.2.8"
rand = "0.8.5"
serde = { version = "1.0.142", features = ["derive"] }
serde_json = "1.0.83"
tungstenite = "0.16"
base64 = "0.13.0"
thiserror = "1.0.30"
thiserror = "1.0.32"
derive_more = "0.99.17"
parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }


[dev-dependencies]
iroha_permissions_validators = { version = "=2.0.0-pre-rc.7", path = "../permissions_validators" }
iroha = { path = "../cli", features = ["dev-telemetry", "telemetry"] }

test_network = { version = "=2.0.0-pre-rc.7", path = "../core/test_network" }
tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread"]}
criterion = { version = "0.3.5", features = ["html_reports"] }
color-eyre = "0.5.11"
tempfile = "3"
hex = "0.4.0"
tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread"] }
criterion = { version = "0.3.6", features = ["html_reports"] }
color-eyre = "0.6.2"
tempfile = "3.3.0"
hex = "0.4.3"

tracing-subscriber = { version = "0.3.0", default-features = false, features = ["fmt", "ansi"] }
tracing-flame = { version = "0.2.0" }
tracing-subscriber = { version = "0.3.15", default-features = false, features = ["fmt", "ansi"] }
tracing-flame = "0.2.0"

[[bench]]
name = "torii"
Expand Down
2 changes: 1 addition & 1 deletion client/examples/million_accounts_genesis.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(missing_docs, clippy::pedantic, clippy::restriction)]

use std::{thread, time::Duration};
use std::{thread, time::Duration, collections::HashSet};

use iroha::samples::get_config;
use iroha_core::genesis::{
Expand Down
27 changes: 21 additions & 6 deletions client/src/client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ where
| StatusCode::UNAUTHORIZED
| StatusCode::FORBIDDEN
| StatusCode::NOT_FOUND => {
let mut res = QueryError::decode_all(resp.body().as_ref());
let mut res = QueryError::decode_all(&mut resp.body().as_ref());
if res.is_err() {
warn!("Can't decode query error, not all bytes were consumed");
res = QueryError::decode(&mut resp.body().as_ref());
Expand Down Expand Up @@ -569,25 +569,39 @@ impl Client {
///
/// # Examples
///
/// ```rust,ignore
/// ```rust
/// use eyre::Result;
/// use iroha_client::{
/// client::{Client, ResponseHandler},
/// http::{RequestBuilder, Response},
/// http::{RequestBuilder, Response, Method},
/// };
/// use iroha_data_model::prelude::{Account, FindAllAccounts, Pagination};
/// use iroha_data_model::{predicate::PredicateBox, prelude::{Account, FindAllAccounts, Pagination}};
///
/// struct YourAsyncRequest;
///
/// impl YourAsyncRequest {
/// async fn send(self) -> Response<Vec<u8>> {
/// // do the stuff
/// todo!()
/// }
/// }
///
/// // Implement builder for this request
/// impl RequestBuilder for YourAsyncRequest {
/// // ...
/// fn new(_: Method, url: impl AsRef<str>) -> Self {
/// todo!()
/// }
///
/// fn param<K: AsRef<str>, V: ToString>(self, _: K, _: V) -> Self {
/// todo!()
/// }
///
/// fn header<N: AsRef<str>, V: ToString>(self, _: N, _: V) -> Self {
/// todo!()
/// }
///
/// fn body(self, data: Vec<u8>) -> Self {
/// todo!()
/// }
/// }
///
/// async fn fetch_accounts(client: &Client) -> Result<Vec<Account>> {
Expand All @@ -596,6 +610,7 @@ impl Client {
/// let (req, resp_handler) = client.prepare_query_request::<_, YourAsyncRequest>(
/// FindAllAccounts::new(),
/// Pagination::default(),
/// PredicateBox::default(),
/// )?;
///
/// // Do what you need to send the request and to get the response
Expand Down
25 changes: 21 additions & 4 deletions client/src/http.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,27 +161,43 @@ pub mod ws {
/// initial WS flow stage - [`crate::client::events_api::flow::Init`].
/// Here is an example (oversimplified) of how you can use it:
///
/// ```rust,ignore
/// ```rust
/// use eyre::Result;
/// use iroha_data_model::prelude::Event;
/// use iroha_client::{
/// client::events_api::flow as events_api_flow,
/// http::{
/// ws::conn_flow::{EventData, Events, Handshake, Init, InitData},
/// RequestBuilder,
/// RequestBuilder, Method
/// },
/// };
///
/// // Some request builder
/// struct MyBuilder;
///
/// impl RequestBuilder for MyBuilder {
/// /* ... */
/// fn new(_: Method, url: impl AsRef<str>) -> Self {
/// todo!()
/// }
///
/// fn param<K: AsRef<str>, V: ToString>(self, _: K, _: V) -> Self {
/// todo!()
/// }
///
/// fn header<N: AsRef<str>, V: ToString>(self, _: N, _: V) -> Self {
/// todo!()
/// }
///
/// fn body(self, data: Vec<u8>) -> Self {
/// todo!()
/// }
/// }
///
/// impl MyBuilder {
///
/// fn connect(self) -> MyStream {
/// /* ... */
/// MyStream {}
/// }
/// }
///
Expand All @@ -192,8 +208,9 @@ pub mod ws {
/// // Receive message
/// fn get_next(&self) -> Vec<u8> {
/// /* ... */
/// Vec::new()
/// }
///
///
/// // Send message
/// fn send(&self, msg: Vec<u8>) {
/// /* ... */
Expand Down
8 changes: 4 additions & 4 deletions client_cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model" }
iroha_crypto = { version = "=2.0.0-pre-rc.7", path = "../crypto" }
iroha_config = { version = "=2.0.0-pre-rc.7", path = "../config" }

color-eyre = "0.5.11"
clap = { version = "3.1.10", features = ["derive"] }
dialoguer = { version = "0.9", default-features = false }
serde_json = "1.0"
color-eyre = "0.6.2"
clap = { version = "3.2.16", features = ["derive"] }
dialoguer = { version = "0.10.2", default-features = false }
serde_json = "1.0.83"
14 changes: 7 additions & 7 deletions config/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ iroha_config_base = { path = "base" }
iroha_data_model = { version = "=2.0.0-pre-rc.7", path = "../data_model" }
iroha_primitives = { version = "=2.0.0-pre-rc.7", path = "../primitives" }
iroha_crypto = { version = "=2.0.0-pre-rc.7", path = "../crypto" }
eyre = "0.6.5"
tracing = "0.1.13"
tracing-subscriber = { version = "0.3.0", default-features = false, features = ["fmt", "ansi"] }
eyre = "0.6.8"
tracing = "0.1.36"
tracing-subscriber = { version = "0.3.15", default-features = false, features = ["fmt", "ansi"] }
url = { version = "2.2.2", features = ["serde"] }

serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0.30"
crossbeam = "0.8.1"
serde = { version = "1.0.142", default-features = false, features = ["derive"] }
serde_json = "1.0.83"
thiserror = "1.0.32"
crossbeam = "0.8.2"
derive_more = "0.99.17"
10 changes: 5 additions & 5 deletions config/base/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "iroha_config_base"
version = "2.0.0-pre-rc.5"
version = "2.0.0-pre-rc.7"
authors = ["Iroha 2 team <https://github.com/orgs/soramitsu/teams/iroha2>"]
edition = "2021"

[dependencies]
iroha_config_derive = { path = "derive" }

serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0.30"
crossbeam = "0.8.1"
serde = { version = "1.0.142", default-features = false, features = ["derive"] }
serde_json = "1.0.83"
thiserror = "1.0.32"
crossbeam = "0.8.2"
derive_more = "0.99.17"
8 changes: 4 additions & 4 deletions config/base/derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ edition = "2021"
proc-macro = true

[dependencies]
syn = { version = "1.0", default-features = false, features = ["derive", "parsing", "proc-macro", "clone-impls", "printing"] }
syn = { version = "1.0.99", default-features = false, features = ["derive", "parsing", "proc-macro", "clone-impls", "printing"] }
# This is the maximally compressed set of features. Yes we also need "printing".
quote = "1.0"
proc-macro2 = "1.0"
proc-macro-error = "1.0"
quote = "1.0.21"
proc-macro2 = "1.0.43"
proc-macro-error = "1.0.4"
42 changes: 21 additions & 21 deletions core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,34 +47,34 @@ iroha_telemetry = { version = "=2.0.0-pre-rc.7", path = "../telemetry" }
iroha_schema = { version = "=2.0.0-pre-rc.7", path = "../schema" }
iroha_primitives = { version = "=2.0.0-pre-rc.7", path = "../primitives" }

async-trait = "0.1"
async-stream = "0.3.2"
dashmap = { version = "4.0" }
eyre = "0.6.5"
futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] }
parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] }
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tokio = { version = "1.6.0", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs"]}
tokio-stream = { version = "0.1.6", features = ["fs"]}
crossbeam-queue = "0.3"
thiserror = "1.0.28"
pin-project = "1"
wasmtime = "0.36.0"
async-trait = "0.1.57"
async-stream = "0.3.3"
dashmap = "5.3.4"
eyre = "0.6.8"
futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] }
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["derive"] }
rand = "0.8.5"
serde = { version = "1.0.142", features = ["derive"] }
serde_json = "1.0.83"
tokio = { version = "1.20.1", features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs"] }
tokio-stream = { version = "0.1.9", features = ["fs"] }
crossbeam-queue = "0.3.6"
thiserror = "1.0.32"
pin-project = "1.0.11"
wasmtime = "0.39.1"
byteorder = "1.4.3"

# transitive dependencies
anyhow = ">= 1.0"
anyhow = "1.0.60"
derive_more = "0.99.17"
getset = "0.1.2"

[dev-dependencies]
tempfile = "3"
criterion = "0.3"
hex = "0.4.0"
byte-unit = "4.0.12"
once_cell = "1.8.0"
tempfile = "3.3.0"
criterion = "0.3.6"
hex = "0.4.3"
byte-unit = "4.0.14"
once_cell = "1.13.0"

[[bench]]
name = "sumeragi"
Expand Down
14 changes: 7 additions & 7 deletions core/test_network/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ iroha_logger = { version = "=2.0.0-pre-rc.7", path = "../../logger" }
iroha_permissions_validators = { version = "=2.0.0-pre-rc.7", path = "../../permissions_validators" }


eyre = "0.6.5"
futures = { version = "0.3.17", default-features = false, features = ["std", "async-await"] }
once_cell = "1.8.0"
rand = "0.8"
tempfile = "3"
tokio = { version = "1.6.0", features = ["rt", "rt-multi-thread", "macros"]}
eyre = "0.6.8"
futures = { version = "0.3.21", default-features = false, features = ["std", "async-await"] }
once_cell = "1.13.0"
rand = "0.8.5"
tempfile = "3.3.0"
tokio = { version = "1.20.1", features = ["rt", "rt-multi-thread", "macros"] }
unique_port = "0.2.1"

[dev-dependencies]
async-trait = "0.1"
async-trait = "0.1.57"
Loading

0 comments on commit a3ec0da

Please sign in to comment.