From 1b4526397588e6aa85f1c18e2a65dedd3e84df44 Mon Sep 17 00:00:00 2001 From: StackOverflowExcept1on <109800286+StackOverflowExcept1on@users.noreply.github.com> Date: Sun, 8 Sep 2024 12:32:10 +0300 Subject: [PATCH] chore(deps): update alloy-sol-type-parser, remove old code --- Cargo.lock | 9 +++++---- Cargo.toml | 3 --- ethexe/cli/src/tests.rs | 3 +-- ethexe/observer/src/observer.rs | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7953d9f9bee..e60f8cb90de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -669,8 +669,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.8.0" -source = "git+https://github.com/gear-tech/alloy-core?branch=custom-error#f98764267344a503aed6d1d60c103e22a7984865" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6b5d462d4520bd9ed70d8364c6280aeff13baa46ea26be1ddd33538dbbe6ac" dependencies = [ "serde", "winnow 0.6.6", @@ -10865,7 +10866,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc7c92f190c97f79b4a332f5e81dcf68c8420af2045c936c9be0bc9de6f63b5" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -11019,7 +11020,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.71", diff --git a/Cargo.toml b/Cargo.toml index ed88c17abba..8c7e0496a30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -585,6 +585,3 @@ blake3 = { git = "https://github.com/gear-tech/BLAKE3", branch = "fix-clang-cl-c # TODO: remove after https://github.com/pepyakin/wabt-rs/pull/84 wabt = { git = "https://github.com/gear-tech/wabt-rs", branch = "al-win-crt" } - -# TODO: remove after https://github.com/alloy-rs/core/pull/718 -alloy-sol-type-parser = { git = "https://github.com/gear-tech/alloy-core", branch = "custom-error" } diff --git a/ethexe/cli/src/tests.rs b/ethexe/cli/src/tests.rs index db7989e3509..403e2942afd 100644 --- a/ethexe/cli/src/tests.rs +++ b/ethexe/cli/src/tests.rs @@ -239,9 +239,8 @@ impl TestEnv { } pub fn start_anvil() -> AnvilInstance { - let mut anvil = Anvil::new().try_spawn().unwrap(); + let anvil = Anvil::new().try_spawn().unwrap(); log::info!("📍 Anvil started at {}", anvil.ws_endpoint()); - drop(anvil.child_mut().stdout.take()); //temp fix for alloy#1078 anvil } diff --git a/ethexe/observer/src/observer.rs b/ethexe/observer/src/observer.rs index f4e7f555c16..313aed11725 100644 --- a/ethexe/observer/src/observer.rs +++ b/ethexe/observer/src/observer.rs @@ -319,8 +319,7 @@ mod tests { async fn test_deployment() -> Result<()> { gear_utils::init_default_logger(); - let mut anvil = Anvil::new().try_spawn()?; - drop(anvil.child_mut().stdout.take()); //temp fix for alloy#1078 + let anvil = Anvil::new().try_spawn()?; let ethereum_rpc = anvil.ws_endpoint();