From 8eed3fb62276e793576d6cedb361d4badbf514a6 Mon Sep 17 00:00:00 2001 From: Marko Atanasievski Date: Fri, 26 Jul 2024 14:43:21 +0200 Subject: [PATCH] fix: cleanup dependencies --- Cargo.lock | 96 +++++----------------- trace_decoder/Cargo.toml | 2 +- trace_decoder/tests/trace_decoder_tests.rs | 2 +- 3 files changed, 21 insertions(+), 79 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ce8e1356..abdd9b672 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,7 +61,7 @@ name = "alloy" version = "0.1.1" source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939" dependencies = [ - "alloy-consensus 0.1.1", + "alloy-consensus", "alloy-core", "alloy-json-rpc", "alloy-provider", @@ -87,24 +87,10 @@ name = "alloy-consensus" version = "0.1.1" source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939" dependencies = [ - "alloy-eips 0.1.1", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.1", - "c-kzg", - "serde", -] - -[[package]] -name = "alloy-consensus" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da374e868f54c7f4ad2ad56829827badca388efd645f8cf5fccc61c2b5343504" -dependencies = [ - "alloy-eips 0.1.4", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.4", + "alloy-serde", "c-kzg", "serde", ] @@ -126,22 +112,7 @@ source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1 dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.1", - "c-kzg", - "once_cell", - "serde", - "sha2", -] - -[[package]] -name = "alloy-eips" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76ecab54890cdea1e4808fc0891c7e6cfcf71fe1a9fe26810c7280ef768f4ed" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.4", + "alloy-serde", "c-kzg", "once_cell", "serde", @@ -165,12 +136,12 @@ name = "alloy-network" version = "0.1.1" source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939" dependencies = [ - "alloy-consensus 0.1.1", - "alloy-eips 0.1.1", + "alloy-consensus", + "alloy-eips", "alloy-json-rpc", "alloy-primitives", - "alloy-rpc-types-eth 0.1.1", - "alloy-serde 0.1.1", + "alloy-rpc-types-eth", + "alloy-serde", "alloy-signer", "alloy-sol-types", "async-trait", @@ -207,13 +178,13 @@ version = "0.1.1" source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939" dependencies = [ "alloy-chains", - "alloy-consensus 0.1.1", - "alloy-eips 0.1.1", + "alloy-consensus", + "alloy-eips", "alloy-json-rpc", "alloy-network", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 0.1.1", + "alloy-rpc-types-eth", "alloy-rpc-types-trace", "alloy-transport", "alloy-transport-http", @@ -280,9 +251,9 @@ name = "alloy-rpc-types" version = "0.1.1" source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939" dependencies = [ - "alloy-rpc-types-eth 0.1.1", + "alloy-rpc-types-eth", "alloy-rpc-types-trace", - "alloy-serde 0.1.1", + "alloy-serde", ] [[package]] @@ -290,29 +261,11 @@ name = "alloy-rpc-types-eth" version = "0.1.1" source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939" dependencies = [ - "alloy-consensus 0.1.1", - "alloy-eips 0.1.1", + "alloy-consensus", + "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.1", - "alloy-sol-types", - "itertools 0.13.0", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "alloy-rpc-types-eth" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4123ee21f99ba4bd31bfa36ba89112a18a500f8b452f02b35708b1b951e2b9" -dependencies = [ - "alloy-consensus 0.1.4", - "alloy-eips 0.1.4", - "alloy-primitives", - "alloy-rlp", - "alloy-serde 0.1.4", + "alloy-serde", "alloy-sol-types", "itertools 0.13.0", "serde", @@ -326,8 +279,8 @@ version = "0.1.1" source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 0.1.1", - "alloy-serde 0.1.1", + "alloy-rpc-types-eth", + "alloy-serde", "serde", "serde_json", ] @@ -342,17 +295,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "alloy-serde" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9416c52959e66ead795a11f4a86c248410e9e368a0765710e57055b8a1774dd6" -dependencies = [ - "alloy-primitives", - "serde", - "serde_json", -] - [[package]] name = "alloy-signer" version = "0.1.1" @@ -5057,7 +4999,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" name = "trace_decoder" version = "0.6.0" dependencies = [ - "alloy-rpc-types-eth 0.1.4", + "alloy", "anyhow", "bitflags 2.6.0", "bitvec", diff --git a/trace_decoder/Cargo.toml b/trace_decoder/Cargo.toml index 75be3bd6c..ed086283c 100644 --- a/trace_decoder/Cargo.toml +++ b/trace_decoder/Cargo.toml @@ -44,7 +44,7 @@ serde_json = { workspace = true } prover = { workspace = true } serde_path_to_error = { workspace = true } plonky2_maybe_rayon = { workspace = true } -alloy-rpc-types-eth = "0.1.4" +alloy = { workspace = true } rstest = "0.21.0" diff --git a/trace_decoder/tests/trace_decoder_tests.rs b/trace_decoder/tests/trace_decoder_tests.rs index 491cca632..e4938b8f3 100644 --- a/trace_decoder/tests/trace_decoder_tests.rs +++ b/trace_decoder/tests/trace_decoder_tests.rs @@ -7,7 +7,7 @@ use std::{ path::{Path, PathBuf}, }; -use alloy_rpc_types_eth::Header; +use alloy::rpc::types::eth::Header; use anyhow::Context as _; use evm_arithmetization::prover::testing::simulate_execution; use evm_arithmetization::GenerationInputs;