chore: manual upgrade of crates dependencies

jpraynaud · jpraynaud · commit 4fe400d7c7e9 · 2024-03-22T12:00:28.000+01:00
- 'config' from '0.3.13. to '0.4.0'
- 'sqlite' from '0.33.0' to '0.34.0'
- 'reqwest' from '0.11.23.' to '0.12.0' which required minor adaptation in Status Code conversion with 'warp'
- 'minicbor' removed as not needed anymore
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/demo/protocol-demo/Cargo.toml b/demo/protocol-demo/Cargo.toml
@@ -9,7 +9,7 @@ license = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-base64 = "0.21.7"
+base64 = "0.22.0"
 blake2 = "0.10.6"
 clap = { version = "4.4.18", features = ["derive"] }
 hex = "0.4.3"
diff --git a/internal/mithril-doc/Cargo.toml b/internal/mithril-doc/Cargo.toml
@@ -11,7 +11,7 @@ include = ["**/*.rs", "Cargo.toml", "README.md", ".gitignore"]
 
 [dependencies]
 clap = { version = "4.4.6", features = ["derive", "env"] }
-config = "0.13.3"
+config = "0.14.0"
 mithril-doc-derive = { path = "../mithril-doc-derive" }
 
 [dev-dependencies]
diff --git a/internal/mithril-persistence/Cargo.toml b/internal/mithril-persistence/Cargo.toml
@@ -22,7 +22,7 @@ serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 sha2 = "0.10.8"
 slog = "2.7.0"
-sqlite = { version = "0.33.0", features = ["bundled"] }
+sqlite = { version = "0.34.0", features = ["bundled"] }
 thiserror = "1.0.56"
 tokio = { version = "1.35.1", features = ["sync"] }
 
diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
@@ -15,7 +15,7 @@ async-trait = "0.1.77"
 chrono = { version = "0.4.33", features = ["serde"] }
 clap = { version = "4.4.18", features = ["derive", "env", "cargo"] }
 cloud-storage = "0.11.1"
-config = "0.13.4"
+config = "0.14.0"
 flate2 = "1.0.28"
 hex = "0.4.3"
 mithril-common = { path = "../mithril-common", features = ["full"] }
@@ -36,7 +36,7 @@ slog = { version = "2.7.0", features = [
 slog-async = "2.8.0"
 slog-bunyan = "2.5.0"
 slog-scope = "4.4.0"
-sqlite = { version = "0.33.0", features = ["bundled"] }
+sqlite = { version = "0.34.0", features = ["bundled"] }
 tar = "0.4.40"
 thiserror = "1.0.56"
 tokio = { version = "1.35.1", features = ["full"] }
diff --git a/mithril-client-cli/Cargo.toml b/mithril-client-cli/Cargo.toml
@@ -27,7 +27,7 @@ async-trait = "0.1.77"
 chrono = { version = "0.4.33", features = ["serde"] }
 clap = { version = "4.4.18", features = ["derive", "env"] }
 cli-table = "0.4.7"
-config = "0.13.4"
+config = "0.14.0"
 fs2 = "0.4.3"
 futures = "0.3.28"
 human_bytes = { version = "0.4.3", features = ["fast"] }
diff --git a/mithril-client/Cargo.toml b/mithril-client/Cargo.toml
@@ -31,7 +31,7 @@ chrono = { version = "0.4.33", features = ["serde"] }
 flate2 = { version = "1.0.28", optional = true }
 flume = { version = "0.11.0", optional = true }
 futures = "0.3.30"
-reqwest = { version = "0.11.23", features = ["json", "stream"] }
+reqwest = { version = "0.12.0", features = ["json", "stream"] }
 semver = "1.0.21"
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml
@@ -43,11 +43,6 @@ kes-summed-ed25519 = { version = "0.2.1", features = [
     "serde_enabled",
     "sk_clone_enabled",
 ] }
-minicbor = { version = "0.20", features = [
-    "std",
-    "half",
-    "derive",
-], optional = true }
 nom = "7.1.3"
 pallas-addresses = { version = "0.24.0", optional = true }
 pallas-codec = { version = "0.24.0", optional = true }
@@ -58,7 +53,7 @@ pallas-traverse = { version = "0.24.0", optional = true }
 rand_chacha = "0.3.1"
 rand_core = "0.6.4"
 rayon = "1.8.1"
-reqwest = { version = "0.11.23", optional = true }
+reqwest = { version = "0.12.0", optional = true }
 semver = "1.0.21"
 serde = { version = "1.0.196", features = ["derive"] }
 serde_bytes = "0.11.14"
@@ -96,7 +91,7 @@ criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
 mockall = "0.12.1"
 pallas-crypto = "0.24.0"
 rand_core = { version = "0.6.4", features = ["getrandom"] }
-reqwest = { version = "0.11.23", features = ["json"] }
+reqwest = { version = "0.12.0", features = ["json"] }
 slog-async = "2.8.0"
 slog-scope = "4.4.0"
 slog-term = "2.9.0"
@@ -114,7 +109,6 @@ random = ["rand_core/getrandom"]
 fs = [
     "tokio/fs",
     "tokio/process",
-    "dep:minicbor",
     "dep:pallas-addresses",
     "dep:pallas-codec",
     "dep:pallas-hardano",
diff --git a/mithril-common/src/chain_observer/model.rs b/mithril-common/src/chain_observer/model.rs
@@ -10,7 +10,7 @@ use crate::{StdError, StdResult};
 cfg_fs_random! {
     use serde::Deserialize;
     use anyhow::Context;
-    use minicbor::{Decode, Decoder, decode};
+    use pallas_codec::minicbor::{Decode, Decoder, decode};
     use pallas_primitives::{alonzo::PlutusData, ToCanonicalJson};
 
     /// [Datum] represents an inline datum from UTxO.
diff --git a/mithril-relay/Cargo.toml b/mithril-relay/Cargo.toml
@@ -13,7 +13,7 @@ repository = { workspace = true }
 [dependencies]
 anyhow = "1.0.79"
 clap = { version = "4.4.18", features = ["derive", "env"] }
-config = "0.13.4"
+config = "0.14.0"
 libp2p = { version = "0.53.2", features = [
     "tokio",
     "gossipsub",
@@ -29,7 +29,7 @@ libp2p = { version = "0.53.2", features = [
 ] }
 mithril-common = { path = "../mithril-common", features = ["full"] }
 mithril-doc = { path = "../internal/mithril-doc" }
-reqwest = { version = "0.11.23", features = ["json"] }
+reqwest = { version = "0.12.0", features = ["json"] }
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 serde_yaml = "0.9.31"
diff --git a/mithril-relay/src/relay/signer.rs b/mithril-relay/src/relay/signer.rs
@@ -138,10 +138,11 @@ mod middlewares {
 
 mod handlers {
     use mithril_common::messages::{RegisterSignatureMessage, RegisterSignerMessage};
-    use reqwest::{Error, Response, StatusCode};
+    use reqwest::{Error, Response};
     use slog_scope::debug;
     use std::convert::Infallible;
     use tokio::sync::mpsc::UnboundedSender;
+    use warp::http::StatusCode;
 
     pub async fn register_signer_handler(
         register_signer_message: RegisterSignerMessage,
@@ -199,9 +200,8 @@ mod handlers {
         response: Result<Response, Error>,
     ) -> Result<impl warp::Reply, Infallible> {
         match response {
-            Ok(response) => {
-                let status = response.status().to_owned();
-                match response.text().await {
+            Ok(response) => match StatusCode::from_u16(response.status().into()) {
+                Ok(status) => match response.text().await {
                     Ok(content) => {
                         debug!(
                             "SignerRelay: received response with status '{status}' and content {content:?}"
@@ -216,8 +216,15 @@ mod handlers {
                             StatusCode::INTERNAL_SERVER_ERROR,
                         )))
                     }
+                },
+                Err(err) => {
+                    debug!("SignerRelay: failed to parse the returned status '{err:?}'");
+                    Ok(Box::new(warp::reply::with_status(
+                        format!("{err:?}"),
+                        StatusCode::INTERNAL_SERVER_ERROR,
+                    )))
                 }
-            }
+            },
             Err(err) => {
                 debug!("SignerRelay: received error '{err:?}'");
                 Ok(Box::new(warp::reply::with_status(
diff --git a/mithril-signer/Cargo.toml b/mithril-signer/Cargo.toml
@@ -14,7 +14,7 @@ anyhow = "1.0.79"
 async-trait = "0.1.77"
 axum = "0.7.4"
 clap = { version = "4.4.18", features = ["derive", "env"] }
-config = "0.13.4"
+config = "0.14.0"
 hex = "0.4.3"
 mithril-common = { path = "../mithril-common", features = ["full"] }
 mithril-doc = { path = "../internal/mithril-doc" }
@@ -24,7 +24,7 @@ openssl-probe = { version = "0.1.5", optional = true }
 prometheus = "0.13.3"
 rand_chacha = "0.3.1"
 rand_core = "0.6.4"
-reqwest = { version = "0.11.23", features = ["json", "stream"] }
+reqwest = { version = "0.12.0", features = ["json", "stream"] }
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 slog = { version = "2.7.0", features = [
@@ -34,7 +34,7 @@ slog = { version = "2.7.0", features = [
 slog-async = "2.8.0"
 slog-bunyan = "2.5.0"
 slog-scope = "4.4.0"
-sqlite = { version = "0.33.0", features = ["bundled"] }
+sqlite = { version = "0.34.0", features = ["bundled"] }
 thiserror = "1.0.56"
 tokio = { version = "1.35.1", features = ["full"] }
 
diff --git a/mithril-test-lab/mithril-aggregator-fake/Cargo.toml b/mithril-test-lab/mithril-aggregator-fake/Cargo.toml
@@ -29,7 +29,7 @@ mithril-common = { "path" = "../../mithril-common", features = [
     "test_tools",
     "random",
 ] }
-reqwest = "0.11.23"
+reqwest = "0.12.0"
 warp = "0.3.6"
 
 [build-dependencies]
diff --git a/mithril-test-lab/mithril-aggregator-fake/src/application.rs b/mithril-test-lab/mithril-aggregator-fake/src/application.rs
@@ -127,7 +127,7 @@ mod tests {
 
     async fn into_response(response: reqwest::Response) -> Response<Bytes> {
         Response::builder()
-            .status(response.status())
+            .status(StatusCode::from_u16(response.status().into()).unwrap())
             .body(response.bytes().await.unwrap())
             .unwrap()
     }
diff --git a/mithril-test-lab/mithril-end-to-end/Cargo.toml b/mithril-test-lab/mithril-end-to-end/Cargo.toml
@@ -24,7 +24,7 @@ hex = "0.4.3"
 indicatif = { version = "0.17.7", features = ["tokio"] }
 mithril-common = { path = "../../mithril-common", features = ["full"] }
 mithril-doc = { path = "../../internal/mithril-doc" }
-reqwest = { version = "0.11.23", features = ["json"] }
+reqwest = { version = "0.12.0", features = ["json"] }
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 serde_yaml = "0.9.31"
