chore: update reqwest and tokio version and other dependencies (#1510)

* chore: update reqwest and tokio version, as well as some other dependencies * chore: update ratatui * chore: udgrade ctrlc
hirosystems · Jul 18, 2024 · bce1a30 · bce1a30
1 parent ce1ffea
commit bce1a30
Show file tree

Hide file tree

Showing 9 changed files with 218 additions and 258 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,3 +24,9 @@ version = "2.7.0"
 chainhook-sdk = { git = "https://github.com/hirosystems/chainhook.git" }
 chainhook-types = { git = "https://github.com/hirosystems/chainhook.git" }
 stacks-codec = { path = "./components/stacks-codec" }
+
+[workspace.dependencies]
+reqwest = { version = "0.12", default-features = false, features = [
+    "json",
+    "rustls-tls",
+] }
diff --git a/components/clarinet-cli/Cargo.toml b/components/clarinet-cli/Cargo.toml
@@ -41,19 +41,15 @@ libc = "0.2.86"
 encoding_rs = "0.8.31"
 percent-encoding = "2.1.0"
 pin-project = "1.0.5"
-reqwest = { version = "0.11", default-features = false, features = [
-    "blocking",
-    "json",
-    "rustls-tls",
-] }
+reqwest = { workspace = true, features = ["blocking"]}
 crossterm = "0.27.0"
-ratatui = { version = "0.25.0", default-features = false, features = ["crossterm"] }
+ratatui = { version = "0.27.0", default-features = false, features = ["crossterm"] }
 base58 = "0.2.0"
 ctrlc = "3.1.9"
 strum = { version = "0.23.0", features = ["derive"] }
 bitcoin = "0.29.2"
 tiny-hderive = "0.3.0"
-segment = { version = "0.1.2", optional = true }
+segment = { version = "0.2.4", optional = true }
 mac_address = { version = "1.1.2", optional = true }
 tower-lsp = { version = "0.19.0", optional = true }
 hex = "0.4.3"

diff --git a/components/clarinet-deployments/Cargo.toml b/components/clarinet-deployments/Cargo.toml
@@ -15,10 +15,7 @@ clarinet-files = { path = "../clarinet-files", default-features = false }
 stacks-rpc-client = { path = "../stacks-rpc-client", optional = true }
 
 # CLI
-reqwest = { version = "0.11", default-features = false, features = [
-    "json",
-    "rustls-tls",
-] }
+reqwest = { workspace = true }
 bitcoin = { version = "0.29.2", optional = true }
 bitcoincore-rpc = { version = "0.16.0", optional = true }
 bitcoincore-rpc-json = { version = "0.16.0", optional = true }

diff --git a/components/clarity-repl/Cargo.toml b/components/clarity-repl/Cargo.toml
@@ -55,10 +55,7 @@ memchr = { version = "2.4.1", optional = true }
 pico-args = { version = "0.5.0", optional = true }
 rustyline = { version = "14.0.0", optional = true }
 hiro_system_kit = { version = "0.1.0", package = "hiro-system-kit", path = "../hiro-system-kit", default-features = false }
-reqwest = { version = "0.11", default-features = false, features = [
-    "json",
-    "rustls-tls",
-] }
+reqwest = { workspace = true }
 
 [dev-dependencies]
 test-case = "*"

diff --git a/components/stacks-codec/Cargo.toml b/components/stacks-codec/Cargo.toml
@@ -10,4 +10,4 @@ description = "Stack wire format implementation"
 clarity = { git = "https://github.com/stacks-network/stacks-core.git", branch="feat/clarity-wasm-develop", package = "clarity", default-features = false, features = ["canonical", "developer-mode", "log"] }
 
 serde = { version = "1", features = ["derive"] }
-wsts = { version = "8.1.0", default-features = false }
+wsts = { version = "9.0.0", default-features = false }
diff --git a/components/stacks-network/Cargo.toml b/components/stacks-network/Cargo.toml
@@ -19,14 +19,10 @@ tracing = "0.1"
 tracing-subscriber = "0.3.3"
 tracing-appender = "0.2.0"
 ctrlc = "3.1.9"
-reqwest = { version = "0.11", default-features = false, features = [
-    "blocking",
-    "json",
-    "rustls-tls",
-] }
+reqwest = { workspace = true, features = ["blocking"] }
 crossbeam-channel = "0.5.6"
 crossterm = { version = "0.27.0" }
-ratatui = { version = "0.25.0", default-features = false, features = ["crossterm"] }
+ratatui = { version = "0.27.0", default-features = false, features = ["crossterm"] }
 chrono = "0.4.31"
 futures = "0.3.12"
 base58 = "0.2.0"

diff --git a/components/stacks-network/src/ui/ui.rs b/components/stacks-network/src/ui/ui.rs
@@ -121,7 +121,8 @@ fn draw_devnet_status(f: &mut Frame, app: &mut App, area: Rect) {
 }
 
 fn draw_blocks(f: &mut Frame, app: &mut App, area: Rect) {
-    let t = Table::new(vec![], vec![] as Vec<&Constraint>)
+    let t = Table::default()
+        .widths(vec![] as Vec<&Constraint>)
         .block(Block::default().borders(Borders::ALL))
         .style(Style::default().fg(Color::White));
     f.render_widget(t, area);
@@ -131,7 +132,7 @@ fn draw_blocks(f: &mut Frame, app: &mut App, area: Rect) {
         .constraints([Constraint::Length(1), Constraint::Min(1)].as_ref())
         .split(area);
 
-    let titles = app.tabs.titles.iter().cloned().collect();
+    let titles = app.tabs.titles.iter().cloned();
     let blocks = Tabs::new(titles)
         .block(Block::default().borders(Borders::NONE))
         .divider(symbols::line::HORIZONTAL)

diff --git a/components/stacks-rpc-client/Cargo.toml b/components/stacks-rpc-client/Cargo.toml
@@ -9,11 +9,7 @@ edition = "2021"
 serde = "1"
 serde_json = "1"
 serde_derive = "1"
-reqwest = { version = "0.11", default-features = false, features = [
-    "blocking",
-    "json",
-    "rustls-tls",
-] }
+reqwest = { workspace = true, features = ["blocking"] }
 hmac = "0.12.0"
 pbkdf2 = { version = "0.12.2", features = ["simple"], default-features = false }
 sha2 = "0.10.0"