Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: alloy-transports -> alloy-transport #6341

Merged
merged 1 commit into from
Nov 17, 2023
Merged

chore: alloy-transports -> alloy-transport #6341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 37 additions & 19 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,10 @@ alloy-dyn-abi = "0.4.1"
alloy-json-abi = "0.4.1"
alloy-sol-types = "0.4.1"
syn-solidity = "0.4.1"
alloy-providers = { path = "../alloy/crates/providers" }
alloy-transports = { path = "../alloy/crates/transports" }
alloy-rpc-types = { path = "../alloy/crates/rpc-types" }
alloy-providers = { path = "../../alloy-rs/alloy/crates/providers" }
alloy-transport = { path = "../../alloy-rs/alloy/crates/transport" }
alloy-transport-http = { path = "../../alloy-rs/alloy/crates/transport-http" }
alloy-rpc-types = { path = "../../alloy-rs/alloy/crates/rpc-types" }

alloy-chains = "0.1.2"
alloy-rlp = "0.3.3"
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ memory-db = "0.29"
alloy-primitives = { workspace = true, features = ["serde"] }
alloy-rpc-types.workspace = true
alloy-providers.workspace = true
alloy-transports.workspace = true
alloy-transport.workspace = true

# axum related
axum.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/anvil/tests/it/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

use std::str::FromStr;

use anvil::{genesis::Genesis, spawn, NodeConfig};
use alloy_providers::provider::TempProvider;
use alloy_primitives::{Address, U256, U64};
use alloy_providers::provider::TempProvider;
use anvil::{genesis::Genesis, spawn, NodeConfig};

#[tokio::test(flavor = "multi_thread")]
async fn can_apply_genesis() {
Expand Down
3 changes: 2 additions & 1 deletion crates/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ alloy-dyn-abi = { workspace = true, features = ["arbitrary", "eip712"] }
alloy-json-abi.workspace = true
alloy-primitives = { workspace = true, features = ["serde", "getrandom", "arbitrary", "rlp"] }
alloy-providers.workspace = true
alloy-transports.workspace = true
alloy-transport.workspace = true
alloy-transport-http.workspace = true

async-trait = "0.1"
auto_impl = "1.1.0"
Expand Down
3 changes: 2 additions & 1 deletion crates/common/src/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
use crate::{ALCHEMY_FREE_TIER_CUPS, REQUEST_TIMEOUT};
use alloy_primitives::U256;
use alloy_providers::provider::{Provider, TempProvider};
use alloy_transports::{Authorization, BoxTransport, Http, Transport};
use alloy_transport::{Authorization, BoxTransport, Transport};
use alloy_transport_http::Http;
use ethers_middleware::gas_oracle::{GasCategory, GasOracle, Polygon};
use ethers_providers::{JwtAuth, JwtKey};
use eyre::{Result, WrapErr};
Expand Down
2 changes: 1 addition & 1 deletion crates/evm/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ revm = { workspace = true, default-features = false, features = [
"arbitrary",
] }
alloy-providers = { workspace = true }
alloy-transports = { workspace = true }
alloy-transport = { workspace = true }
alloy-rpc-types = { workspace = true }
ethers = { workspace = true, features = ["ethers-solc"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/evm/core/src/fork/multi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

use crate::fork::{BackendHandler, BlockchainDb, BlockchainDbMeta, CreateFork, SharedBackend};
use alloy_providers::provider::Provider;
use alloy_transports::BoxTransport;
use alloy_transport::BoxTransport;
use ethers::types::BlockNumber;
use foundry_common::ProviderBuilder;
use foundry_config::Config;
Expand Down
9 changes: 7 additions & 2 deletions crates/test-utils/src/script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,13 @@ impl ScriptTester {
address_indexes: &[(Address, u32)],
) -> &mut Self {
for (address, expected_increment) in address_indexes {
let nonce =
self.provider.as_ref().unwrap().get_transaction_count(*address, None).await.unwrap();
let nonce = self
.provider
.as_ref()
.unwrap()
.get_transaction_count(*address, None)
.await
.unwrap();
let prev_nonce = self.address_nonces.get(address).unwrap();

assert_eq!(nonce, (prev_nonce + U256::from(*expected_increment)));
Expand Down
Loading