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.

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

(chore) update all cargo deps #1275

Merged
merged 7 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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,877 changes: 959 additions & 918 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion aries/agents/aries-vcx-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ did_peer = { path = "../../../did_core/did_methods/did_peer" }
did_key = { path = "../../../did_core/did_methods/did_key" }
public_key = { path = "../../../did_core/public_key" }
async-trait = "0.1.64"
derive_builder = "0.12.0"
serde_json = "1.0.85"
log = "0.4.17"
uuid = "1.2.1"
Expand Down
1 change: 0 additions & 1 deletion aries/agents/aries-vcx-agent/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extern crate derive_builder;
extern crate serde;
extern crate serde_json;
#[macro_use]
Expand Down
14 changes: 6 additions & 8 deletions aries/agents/mediator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,25 @@ aries_vcx_wallet = { path = "../../aries_vcx_wallet", features = [
"vdrtools_wallet",
] }
async-trait = "0.1.73"
axum = "0.6"
axum-macros = "0.3.8"
axum = "0.7.5"
axum-macros = "0.4.1"
diddoc_legacy = { path = "../../misc/legacy/diddoc_legacy" }
dotenvy = "0.15"
env_logger = "0.10.0"
env_logger = "0.11.3"
futures = "0.3.28"
log = "0.4.20"
messages = { path = "../../messages" }
reqwest = { version = "0.11.20", features = ["json"] }
reqwest = { version = "0.12.5", features = ["json"] }
serde = "1.0.188"
serde_json = "1.0.106"
sqlx = "0.7"
thiserror = "1.0.49"
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
tower-http = { version = "0.4.4", features = ["catch-panic"] }
tower-http = { version = "0.5.2", features = ["catch-panic"] }
url = "2.4.1"
uuid = "1.4.1"
test_utils = { path = "../../misc/test_utils" }
base64-url = "2.0.0"
base64-url = "3.0.0"

[dev-dependencies]
base64-url = "2.0.0"
chrono = "0.4.31"
reqwest = { version = "0.11.20", features = ["blocking"] }
4 changes: 2 additions & 2 deletions aries/agents/mediator/client-tui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ edition = "2021"
aries_vcx_wallet = { path = "../../../aries_vcx_wallet", features = [
"vdrtools_wallet",
] }
axum = "0.6.20"
axum = "0.7.5"
cursive = { version = "0.20.0", features = ["crossterm-backend"] }
futures = "0.3.28"
log = "0.4.20"
mediator = { path = ".." }
messages = { path = "../../../messages" }
reqwest = "0.11.22"
reqwest = "0.12.5"
serde_json = "1.0.107"

tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
12 changes: 4 additions & 8 deletions aries/agents/mediator/src/bin/mediator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,10 @@ async fn main() {
.unwrap();
let app_router = mediator::http_routes::build_router(agent).await;
info!("Starting server");
axum::Server::bind(
&endpoint_root
.parse()
.expect("Pass an address to listen on like IP:PORT"),
)
.serve(app_router.into_make_service())
.await
.unwrap();
let listener = tokio::net::TcpListener::bind(&endpoint_root).await.unwrap();
axum::serve(listener, app_router.into_make_service())
.await
.unwrap();
}

fn setup_logging() {
Expand Down
11 changes: 6 additions & 5 deletions aries/agents/mediator/tests/mediator-readme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,22 @@ static LOGGING_INIT: std::sync::Once = std::sync::Once::new();

const ENDPOINT_ROOT: &str = "http://localhost:8005";

#[test]
fn base_path_returns_readme() -> Result<()> {
#[tokio::test]
async fn base_path_returns_readme() -> Result<()> {
LOGGING_INIT.call_once(setup_env_logging);

let client = reqwest::blocking::Client::new();
let client = reqwest::Client::new();
let endpoint: Url = ENDPOINT_ROOT.parse().unwrap();

let res = client
.get(endpoint)
.header(ACCEPT, "application/json")
.send()?
.send()
.await?
.error_for_status()?;
info!("{:?}", res);

let _: ReadmeInfo = res.json()?;
let _: ReadmeInfo = res.json().await?;

Ok(())
}
12 changes: 6 additions & 6 deletions aries/aries_vcx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ did_peer = { path = "../../did_core/did_methods/did_peer" }
did_resolver_registry = { path = "../../did_core/did_resolver_registry" }
bs58 = "0.5.0"
async-trait = "0.1.53"
env_logger = "0.10.0"
env_logger = "0.11.3"
log = "0.4.16"
chrono = "0.4.23"
time = "0.3.20"
Expand All @@ -63,14 +63,14 @@ serde = "1.0.97"
serde_json = "1.0.40"
serde_derive = "1.0.97"
regex = "1.1.0"
base64 = "0.21.4"
base64 = "0.22.1"
sha2 = "0.10.7"
num-bigint = "0.4.5"
futures = { version = "0.3", default-features = false }
uuid = { version = "1.4.1", default-features = false, features = ["v4"] }
strum = "0.25.0"
strum_macros = "0.25.2"
derive_builder = "0.12.0"
strum = "0.26.3"
strum_macros = "0.26.4"
derive_builder = "0.20.0"
tokio = { version = "1.38.0" }
thiserror = "1.0.37"
url = { version = "2.3", features = ["serde"] }
Expand All @@ -79,7 +79,7 @@ backtrace = { optional = true, version = "0.3" }
[dev-dependencies]
test_utils = { path = "../misc/test_utils" }
wallet_migrator = { path = "../misc/wallet_migrator" }
async-channel = "1.7.1"
async-channel = "2.3.1"
tokio = { version = "1.38", features = ["rt", "macros", "rt-multi-thread"] }
pretty_assertions = "1.4.0"
did_resolver_sov = { path = "../../did_core/did_methods/did_resolver_sov" }
6 changes: 3 additions & 3 deletions aries/aries_vcx_wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ askar_wallet = ["dep:aries-askar"]

[dependencies]
anyhow = "1.0"
aries-askar = { version = "=0.3.0", optional = true }
aries-askar = { version = "0.3.1", optional = true }
async-trait = "0.1.68"
bs58 = { version = "0.5" }
base64 = "0.21"
base64 = "0.22.1"
libvdrtools = { path = "../misc/legacy/libvdrtools", optional = true }
log = "0.4.17"
indy-api-types = { path = "../misc/legacy/libvdrtools/indy-api-types", optional = true }
Expand All @@ -26,7 +26,7 @@ public_key = { path = "../../did_core/public_key"}
rand = "0.8.5"
thiserror = "1.0.40"
tokio = { version = "1.38" }
typed-builder = "0.18.1"
typed-builder = "0.19.1"
uuid = { version = "1.3.0", default-features = false, features = ["v4"] }

[dev-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions aries/messages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ chrono = { version = "0.4.23", features = ["serde"] }
lazy_static = "1.3"
serde_json = "1.0.100"
url = { version = "2.3", features = ["serde"] }
strum = "0.24.1"
strum_macros = "0.24.3"
strum = "0.26.3"
strum_macros = "0.26.4"
thiserror = "1.0.37"
derive_more = "0.99.17"
transitive = "0.5.0"
transitive = "1.0.1"
isolang = { version = "2.2.0" }
typed-builder = "0.18.1"
typed-builder = "0.19.1"
messages_macros = { path = "../messages_macros" }
diddoc_legacy = { path = "../misc/legacy/diddoc_legacy" }
shared = { path = "../misc/shared" }
Expand Down
2 changes: 1 addition & 1 deletion aries/misc/anoncreds_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ once_cell = "1.19.0"
regex = "1.10.5"
serde = { version = "1.0.203", features = ["derive"] }
serde_json = "1.0.117"
typed-builder = "0.18.1"
typed-builder = "0.19.1"

[dev-dependencies]
rand = "0.8.5"
4 changes: 2 additions & 2 deletions aries/misc/shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ doctest = false
lazy_static = "1.3"
regex = "1.1.0"
thiserror = "1.0.37"
bs58 = "0.4.0"
bs58 = "0.5.1"
serde = { version = "1.0.97", features = ["derive"] }
serde_json = "1.0.96"
reqwest = "0.11.10"
reqwest = "0.12.5"
log = "0.4.17"
2 changes: 1 addition & 1 deletion aries/misc/test_utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ rand = "0.8"
uuid = { version = "1", default-features = false, features = ["v4"] }
async-trait = "0.1"
chrono = "0.4"
env_logger = "0.10"
env_logger = "0.11.3"
log = "0.4"
thiserror = "1.0.40"
2 changes: 1 addition & 1 deletion aries/misc/test_utils/src/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fn _get_timestamp<'a>() -> DelayedFormat<StrftimeItems<'a>> {
}

fn text_format(buf: &mut Formatter, record: &Record) -> std::io::Result<()> {
let level = buf.default_styled_level(record.level());
let level = buf.default_level_style(record.level());
writeln!(
buf,
"{}|{:>5}|{:<30}|{:>35}:{:<4}| {}",
Expand Down
2 changes: 1 addition & 1 deletion aries/wrappers/uniffi-aries-vcx/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ did_parser_nom = { path = "../../../../did_core/did_parser_nom" }
diddoc_legacy = { path = "../../../misc/legacy/diddoc_legacy" }
shared = { path = "../../../misc/shared" }
url = "2.3.1"
android_logger = "0.13.3"
android_logger = "0.14.1"
log = "0.4.16"

[build-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions did_core/did_doc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ version = "0.1.0"
edition = "2021"

[dependencies]
base64 = "0.21.2"
base64 = "0.22.1"
bs58 = "0.5.0"
did_parser_nom = { path = "../did_parser_nom" }
public_key = { path = "../public_key" }
hex = "0.4.3"
multibase = "0.9.1"
pem = "2.0.1"
pem = "3.0.4"
serde = { version = "1.0.159", default-features = false, features = ["derive"] }
serde_json = "1.0.95"
uniresid = { version = "0.1.4", default-features = false, features = ["serde"] }
url = { version = "2.3.1", features = ["serde"] }
display_as_json = { path = "../../misc/display_as_json" }
did_key = { path = "../did_methods/did_key" }
thiserror = "1.0.40"
typed-builder = "0.18.1"
typed-builder = "0.19.1"
log = "0.4"

[dev-dependencies]
pretty_assertions = "1.4.0"
env_logger = "0.10"
env_logger = "0.11.3"

9 changes: 4 additions & 5 deletions did_core/did_methods/did_peer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,19 @@ regex = "1.8.4"
serde = { version = "1.0.164", features = ["derive"] }
serde_json = "1.0.96"
async-trait = "0.1.68"
base64 = "0.21.2"
base64 = "0.22.1"
bs58 = "0.5.0"
multibase = "0.9.1"
unsigned-varint = "0.7.1"
unsigned-varint = "0.8.0"
once_cell = "1.18.0"
sha2 = "0.10.8"
log = "0.4.16"
url = { version = "2.3.1", features = ["serde"] }
display_as_json = { path = "../../../misc/display_as_json" }
derive_builder = "0.12.0"
typed-builder = "0.18.1"
typed-builder = "0.19.1"

[dev-dependencies]
tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt"] }
pretty_assertions = "1.4.0"
env_logger = "0.10"
env_logger = "0.11.3"
log = "0.4"
1 change: 0 additions & 1 deletion did_core/did_methods/did_peer/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extern crate derive_builder;
extern crate display_as_json;

pub mod error;
Expand Down
2 changes: 1 addition & 1 deletion did_core/did_methods/did_resolver_sov/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ url = "2.3.1"
log = "0.4.16"

[dev-dependencies]
mockall = "0.11.4"
mockall = "0.13.0"
aries_vcx = { path = "../../../aries/aries_vcx" }
tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt"] }
uuid = "1.3.1"
Expand Down
2 changes: 1 addition & 1 deletion did_core/did_parser_nom/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ log = "0.4.16"

[dev-dependencies]
serde_test = "1.0.176"
env_logger = "0.10"
env_logger = "0.11.3"
2 changes: 1 addition & 1 deletion did_core/did_resolver_registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ async-trait = "0.1.72"

[dev-dependencies]
tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt"] }
mockall = "0.11.4"
mockall = "0.13.0"
async-trait = "0.1.68"
4 changes: 2 additions & 2 deletions did_core/public_key/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
thiserror = "1.0.40"
serde = { version = "1.0.164", features = ["derive"] }
serde_json = "1.0.96"
base64 = "0.21.2"
base64 = "0.22.1"
bs58 = "0.5.0"
multibase = "0.9.1"
unsigned-varint = "0.7.1"
unsigned-varint = "0.8.0"
2 changes: 1 addition & 1 deletion misc/display_as_json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "MIT"
proc-macro = true

[dependencies]
syn = "1.0"
syn = "2.0.72"
quote = "1.0"

[dev-dependencies]
Expand Down
Loading