From e7f62ef75e8d137c77fbb2fc71bcf1aa72b8ca4f Mon Sep 17 00:00:00 2001 From: Enrique Ortiz Date: Thu, 4 Jan 2024 14:56:53 -0400 Subject: [PATCH 1/2] chore: rename to rpc-trace-types --- Cargo.toml | 2 +- crates/providers/Cargo.toml | 2 +- crates/providers/src/provider.rs | 2 +- crates/{trace-rpc-types => rpc-trace-types}/Cargo.toml | 2 +- crates/{trace-rpc-types => rpc-trace-types}/src/common.rs | 0 crates/{trace-rpc-types => rpc-trace-types}/src/filter.rs | 0 crates/{trace-rpc-types => rpc-trace-types}/src/geth/call.rs | 0 .../{trace-rpc-types => rpc-trace-types}/src/geth/four_byte.rs | 0 crates/{trace-rpc-types => rpc-trace-types}/src/geth/mod.rs | 0 crates/{trace-rpc-types => rpc-trace-types}/src/geth/noop.rs | 0 .../{trace-rpc-types => rpc-trace-types}/src/geth/pre_state.rs | 0 crates/{trace-rpc-types => rpc-trace-types}/src/lib.rs | 0 crates/{trace-rpc-types => rpc-trace-types}/src/parity.rs | 0 crates/{trace-rpc-types => rpc-trace-types}/src/tracerequest.rs | 0 .../test_data/call_tracer/default.json | 0 .../test_data/call_tracer/legacy.json | 0 .../test_data/call_tracer/only_top_call.json | 0 .../test_data/call_tracer/with_log.json | 0 .../test_data/default/structlogs_01.json | 0 .../test_data/pre_state_tracer/default.json | 0 .../test_data/pre_state_tracer/diff_mode.json | 0 .../test_data/pre_state_tracer/legacy.json | 0 22 files changed, 4 insertions(+), 4 deletions(-) rename crates/{trace-rpc-types => rpc-trace-types}/Cargo.toml (98%) rename crates/{trace-rpc-types => rpc-trace-types}/src/common.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/filter.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/geth/call.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/geth/four_byte.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/geth/mod.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/geth/noop.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/geth/pre_state.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/lib.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/parity.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/src/tracerequest.rs (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/call_tracer/default.json (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/call_tracer/legacy.json (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/call_tracer/only_top_call.json (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/call_tracer/with_log.json (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/default/structlogs_01.json (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/pre_state_tracer/default.json (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/pre_state_tracer/diff_mode.json (100%) rename crates/{trace-rpc-types => rpc-trace-types}/test_data/pre_state_tracer/legacy.json (100%) diff --git a/Cargo.toml b/Cargo.toml index 574c89d4c07..e1245ca2403 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ alloy-networks = { version = "0.1.0", path = "crates/networks" } alloy-pubsub = { version = "0.1.0", path = "crates/pubsub" } alloy-rpc-client = { version = "0.1.0", path = "crates/rpc-client" } alloy-rpc-types = { version = "0.1.0", path = "crates/rpc-types" } -alloy-trace-rpc-types = { version = "0.1.0", path = "crates/trace-rpc-types" } +alloy-rpc-trace-types = { version = "0.1.0", path = "crates/rpc-trace-types" } alloy-signer = { version = "0.1.0", path = "crates/signer" } alloy-signer-aws = { version = "0.1.0", path = "crates/signer-aws" } alloy-signer-ledger = { version = "0.1.0", path = "crates/signer-ledger" } diff --git a/crates/providers/Cargo.toml b/crates/providers/Cargo.toml index f8f332dc07d..820d35dde7b 100644 --- a/crates/providers/Cargo.toml +++ b/crates/providers/Cargo.toml @@ -16,7 +16,7 @@ alloy-networks.workspace = true alloy-primitives.workspace = true alloy-rpc-client.workspace = true alloy-rpc-types.workspace = true -alloy-trace-rpc-types.workspace = true +alloy-rpc-trace-types.workspace = true alloy-transport-http.workspace = true alloy-transport.workspace = true async-trait.workspace = true diff --git a/crates/providers/src/provider.rs b/crates/providers/src/provider.rs index 13cc9fe97e9..4207acab82c 100644 --- a/crates/providers/src/provider.rs +++ b/crates/providers/src/provider.rs @@ -8,7 +8,7 @@ use alloy_rpc_types::{ EIP1186AccountProofResponse, FeeHistory, Filter, Log, SyncStatus, Transaction, TransactionReceipt, }; -use alloy_trace_rpc_types::{ +use alloy_rpc_trace_types::{ geth::{GethDebugTracingOptions, GethTrace}, parity::LocalizedTransactionTrace, }; diff --git a/crates/trace-rpc-types/Cargo.toml b/crates/rpc-trace-types/Cargo.toml similarity index 98% rename from crates/trace-rpc-types/Cargo.toml rename to crates/rpc-trace-types/Cargo.toml index 4e9c24d5552..3c0dc937c7f 100644 --- a/crates/trace-rpc-types/Cargo.toml +++ b/crates/rpc-trace-types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "alloy-trace-rpc-types" +name = "alloy-rpc-trace-types" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/crates/trace-rpc-types/src/common.rs b/crates/rpc-trace-types/src/common.rs similarity index 100% rename from crates/trace-rpc-types/src/common.rs rename to crates/rpc-trace-types/src/common.rs diff --git a/crates/trace-rpc-types/src/filter.rs b/crates/rpc-trace-types/src/filter.rs similarity index 100% rename from crates/trace-rpc-types/src/filter.rs rename to crates/rpc-trace-types/src/filter.rs diff --git a/crates/trace-rpc-types/src/geth/call.rs b/crates/rpc-trace-types/src/geth/call.rs similarity index 100% rename from crates/trace-rpc-types/src/geth/call.rs rename to crates/rpc-trace-types/src/geth/call.rs diff --git a/crates/trace-rpc-types/src/geth/four_byte.rs b/crates/rpc-trace-types/src/geth/four_byte.rs similarity index 100% rename from crates/trace-rpc-types/src/geth/four_byte.rs rename to crates/rpc-trace-types/src/geth/four_byte.rs diff --git a/crates/trace-rpc-types/src/geth/mod.rs b/crates/rpc-trace-types/src/geth/mod.rs similarity index 100% rename from crates/trace-rpc-types/src/geth/mod.rs rename to crates/rpc-trace-types/src/geth/mod.rs diff --git a/crates/trace-rpc-types/src/geth/noop.rs b/crates/rpc-trace-types/src/geth/noop.rs similarity index 100% rename from crates/trace-rpc-types/src/geth/noop.rs rename to crates/rpc-trace-types/src/geth/noop.rs diff --git a/crates/trace-rpc-types/src/geth/pre_state.rs b/crates/rpc-trace-types/src/geth/pre_state.rs similarity index 100% rename from crates/trace-rpc-types/src/geth/pre_state.rs rename to crates/rpc-trace-types/src/geth/pre_state.rs diff --git a/crates/trace-rpc-types/src/lib.rs b/crates/rpc-trace-types/src/lib.rs similarity index 100% rename from crates/trace-rpc-types/src/lib.rs rename to crates/rpc-trace-types/src/lib.rs diff --git a/crates/trace-rpc-types/src/parity.rs b/crates/rpc-trace-types/src/parity.rs similarity index 100% rename from crates/trace-rpc-types/src/parity.rs rename to crates/rpc-trace-types/src/parity.rs diff --git a/crates/trace-rpc-types/src/tracerequest.rs b/crates/rpc-trace-types/src/tracerequest.rs similarity index 100% rename from crates/trace-rpc-types/src/tracerequest.rs rename to crates/rpc-trace-types/src/tracerequest.rs diff --git a/crates/trace-rpc-types/test_data/call_tracer/default.json b/crates/rpc-trace-types/test_data/call_tracer/default.json similarity index 100% rename from crates/trace-rpc-types/test_data/call_tracer/default.json rename to crates/rpc-trace-types/test_data/call_tracer/default.json diff --git a/crates/trace-rpc-types/test_data/call_tracer/legacy.json b/crates/rpc-trace-types/test_data/call_tracer/legacy.json similarity index 100% rename from crates/trace-rpc-types/test_data/call_tracer/legacy.json rename to crates/rpc-trace-types/test_data/call_tracer/legacy.json diff --git a/crates/trace-rpc-types/test_data/call_tracer/only_top_call.json b/crates/rpc-trace-types/test_data/call_tracer/only_top_call.json similarity index 100% rename from crates/trace-rpc-types/test_data/call_tracer/only_top_call.json rename to crates/rpc-trace-types/test_data/call_tracer/only_top_call.json diff --git a/crates/trace-rpc-types/test_data/call_tracer/with_log.json b/crates/rpc-trace-types/test_data/call_tracer/with_log.json similarity index 100% rename from crates/trace-rpc-types/test_data/call_tracer/with_log.json rename to crates/rpc-trace-types/test_data/call_tracer/with_log.json diff --git a/crates/trace-rpc-types/test_data/default/structlogs_01.json b/crates/rpc-trace-types/test_data/default/structlogs_01.json similarity index 100% rename from crates/trace-rpc-types/test_data/default/structlogs_01.json rename to crates/rpc-trace-types/test_data/default/structlogs_01.json diff --git a/crates/trace-rpc-types/test_data/pre_state_tracer/default.json b/crates/rpc-trace-types/test_data/pre_state_tracer/default.json similarity index 100% rename from crates/trace-rpc-types/test_data/pre_state_tracer/default.json rename to crates/rpc-trace-types/test_data/pre_state_tracer/default.json diff --git a/crates/trace-rpc-types/test_data/pre_state_tracer/diff_mode.json b/crates/rpc-trace-types/test_data/pre_state_tracer/diff_mode.json similarity index 100% rename from crates/trace-rpc-types/test_data/pre_state_tracer/diff_mode.json rename to crates/rpc-trace-types/test_data/pre_state_tracer/diff_mode.json diff --git a/crates/trace-rpc-types/test_data/pre_state_tracer/legacy.json b/crates/rpc-trace-types/test_data/pre_state_tracer/legacy.json similarity index 100% rename from crates/trace-rpc-types/test_data/pre_state_tracer/legacy.json rename to crates/rpc-trace-types/test_data/pre_state_tracer/legacy.json From dcb189e1fd78071e902bf270958031a17577f9cc Mon Sep 17 00:00:00 2001 From: Enrique Ortiz Date: Thu, 4 Jan 2024 14:58:04 -0400 Subject: [PATCH 2/2] chore: fmt --- crates/providers/src/provider.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/providers/src/provider.rs b/crates/providers/src/provider.rs index 4207acab82c..9ca7dd25097 100644 --- a/crates/providers/src/provider.rs +++ b/crates/providers/src/provider.rs @@ -3,15 +3,15 @@ use crate::utils::{self, EstimatorFunction}; use alloy_primitives::{Address, BlockHash, Bytes, StorageKey, StorageValue, TxHash, U256, U64}; use alloy_rpc_client::{ClientBuilder, RpcClient}; +use alloy_rpc_trace_types::{ + geth::{GethDebugTracingOptions, GethTrace}, + parity::LocalizedTransactionTrace, +}; use alloy_rpc_types::{ AccessListWithGasUsed, Block, BlockId, BlockNumberOrTag, CallRequest, EIP1186AccountProofResponse, FeeHistory, Filter, Log, SyncStatus, Transaction, TransactionReceipt, }; -use alloy_rpc_trace_types::{ - geth::{GethDebugTracingOptions, GethTrace}, - parity::LocalizedTransactionTrace, -}; use alloy_transport::{BoxTransport, Transport, TransportErrorKind, TransportResult}; use alloy_transport_http::Http; use auto_impl::auto_impl;