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

Jump to bottom

chore: remove Cow from TempProvider #43

Merged
merged 4 commits into from
Nov 22, 2023
Merged

chore: remove Cow from TempProvider #43

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac8f6c8
chore: start removing cows
Evalir Nov 22, 2023
b1885c2
chore: uncow tempProvider
Evalir Nov 22, 2023
988e228
Apply suggestions from code review
Evalir Nov 22, 2023
39eb4b0
switch to single element tuple
Evalir Nov 22, 2023
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
78 changes: 38 additions & 40 deletions crates/providers/src/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ use alloy_rpc_client::{ClientBuilder, RpcClient};
use alloy_rpc_types::{
trace::{GethDebugTracingOptions, GethTrace, LocalizedTransactionTrace},
AccessListWithGasUsed, Block, BlockId, BlockNumberOrTag, CallRequest,
EIP1186AccountProofResponse, FeeHistory, Filter, Log, RpcBlockHash, SyncStatus, Transaction,
EIP1186AccountProofResponse, FeeHistory, Filter, Log, SyncStatus, Transaction,
TransactionReceipt,
};
use alloy_transport::{BoxTransport, Transport, TransportErrorKind, TransportResult};
use alloy_transport_http::Http;
use auto_impl::auto_impl;
use reqwest::Client;
use serde::{Deserialize, Serialize};
use std::borrow::Cow;
use thiserror::Error;

#[derive(Debug, Error, Serialize, Deserialize)]
Expand Down Expand Up @@ -280,10 +279,10 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_getTransactionCount",
Cow::<(Address, BlockId)>::Owned((
(
address,
tag.unwrap_or(BlockNumberOrTag::Latest.into()),
)),
),
)
.await
}
Expand All @@ -294,7 +293,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("eth_blockNumber", Cow::<()>::Owned(())).await.map(|num: U64| num.to::<u64>())
self.inner.prepare("eth_blockNumber", ()).await.map(|num: U64| num.to::<u64>())
}

/// Gets the balance of the account at the specified tag, which defaults to latest.
Expand All @@ -305,10 +304,10 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_getBalance",
Cow::<(Address, BlockId)>::Owned((
(
address,
tag.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest)),
)),
),
)
.await
}
Expand All @@ -319,7 +318,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
Self: Sync,
{
self.inner
.prepare("eth_getBlockByHash", Cow::<(BlockHash, bool)>::Owned((hash, full)))
.prepare("eth_getBlockByHash", (hash, full))
.await
}

Expand All @@ -335,7 +334,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_getBlockByNumber",
Cow::<(BlockNumberOrTag, bool)>::Owned((number.into(), full)),
(number.into(), full),
)
.await
}
Expand All @@ -345,7 +344,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("eth_chainId", Cow::<()>::Owned(())).await
self.inner.prepare("eth_chainId", ()).await
}

/// Gets the specified storage value from [Address].
Expand All @@ -358,11 +357,11 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_getStorageAt",
Cow::<(Address, StorageKey, BlockId)>::Owned((
(
address,
key,
tag.unwrap_or(BlockNumberOrTag::Latest.into()),
)),
),
)
.await
}
Expand All @@ -377,7 +376,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
Self: Sync,
{
self.inner
.prepare("eth_getCode", Cow::<(Address, BlockId)>::Owned((address, tag.into())))
.prepare("eth_getCode", (address, tag.into()))
.await
}

Expand All @@ -389,9 +388,8 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_getTransactionByHash",
// Force alloy-rs/alloy to encode this an array of strings,
// even if we only need to send one hash.
Cow::<Vec<TxHash>>::Owned(vec![hash]),
// Force alloy to encode this an array of strings
vec![hash],
Evalir marked this conversation as resolved.
Show resolved Hide resolved
)
.await
}
Expand All @@ -401,7 +399,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("eth_getLogs", Cow::<Vec<Filter>>::Owned(vec![filter])).await
self.inner.prepare("eth_getLogs", vec![filter]).await
}

/// Gets the accounts in the remote node. This is usually empty unless you're using a local
Expand All @@ -410,15 +408,15 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("eth_accounts", Cow::<()>::Owned(())).await
self.inner.prepare("eth_accounts", ()).await
}

/// Gets the current gas price.
async fn get_gas_price(&self) -> TransportResult<U256>
where
Self: Sync,
{
self.inner.prepare("eth_gasPrice", Cow::<()>::Owned(())).await
self.inner.prepare("eth_gasPrice", ()).await
}

/// Gets a [TransactionReceipt] if it exists, by its [TxHash].
Expand All @@ -429,7 +427,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("eth_getTransactionReceipt", Cow::<Vec<TxHash>>::Owned(vec![hash])).await
self.inner.prepare("eth_getTransactionReceipt", vec![hash]).await
Evalir marked this conversation as resolved.
Show resolved Hide resolved
}

/// Returns a collection of historical gas information [FeeHistory] which
Expand All @@ -446,11 +444,11 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_feeHistory",
Cow::<(U256, BlockNumberOrTag, Vec<f64>)>::Owned((
(
block_count,
last_block.into(),
reward_percentiles.to_vec(),
Evalir marked this conversation as resolved.
Show resolved Hide resolved
)),
),
)
.await
}
Expand All @@ -463,7 +461,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("eth_getBlockReceipts", Cow::<BlockNumberOrTag>::Owned(block)).await
self.inner.prepare("eth_getBlockReceipts", block).await
}

/// Gets an uncle block through the tag [BlockId] and index [U64].
Expand All @@ -481,15 +479,15 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_getUncleByBlockHashAndIndex",
Cow::<(RpcBlockHash, U64)>::Owned((hash, idx)),
(hash, idx),
)
.await
}
BlockId::Number(number) => {
self.inner
.prepare(
"eth_getUncleByBlockNumberAndIndex",
Cow::<(BlockNumberOrTag, U64)>::Owned((number, idx)),
(number, idx),
)
.await
}
Expand All @@ -501,7 +499,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("eth_syncing", Cow::<()>::Owned(())).await
self.inner.prepare("eth_syncing", ()).await
}

/// Execute a smart contract call with [CallRequest] without publishing a transaction.
Expand All @@ -512,10 +510,10 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_call",
Cow::<(CallRequest, BlockId)>::Owned((
(
tx,
block.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest)),
)),
),
)
.await
}
Expand All @@ -526,20 +524,20 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
Self: Sync,
{
if let Some(block_id) = block {
let params = Cow::<(CallRequest, BlockId)>::Owned((tx, block_id));
let params = (tx, block_id);
self.inner.prepare("eth_estimateGas", params).await
} else {
let params = Cow::<CallRequest>::Owned(tx);
let params = tx;
self.inner.prepare("eth_estimateGas", params).await
}
}

/// Sends an already-signed transaction.
/// Sends an already-signed transaction.
async fn send_raw_transaction(&self, tx: Bytes) -> TransportResult<TxHash>
where
Self: Sync,
{
self.inner.prepare("eth_sendRawTransaction", Cow::<Bytes>::Owned(tx)).await
self.inner.prepare("eth_sendRawTransaction", tx).await
}

/// Estimates the EIP1559 `maxFeePerGas` and `maxPriorityFeePerGas` fields.
Expand Down Expand Up @@ -601,11 +599,11 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_getProof",
Cow::<(Address, Vec<StorageKey>, BlockId)>::Owned((
(
address,
keys,
block.unwrap_or(BlockNumberOrTag::Latest.into()),
)),
),
)
.await
}
Expand All @@ -621,10 +619,10 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"eth_createAccessList",
Cow::<(CallRequest, BlockId)>::Owned((
(
request,
block.unwrap_or(BlockNumberOrTag::Latest.into()),
)),
),
)
.await
}
Expand All @@ -637,7 +635,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("trace_transaction", Cow::<Vec<TxHash>>::Owned(vec![hash])).await
self.inner.prepare("trace_transaction", vec![hash]).await
}

async fn debug_trace_transaction(
Expand All @@ -651,7 +649,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
self.inner
.prepare(
"debug_traceTransaction",
Cow::<(TxHash, GethDebugTracingOptions)>::Owned((hash, trace_options)),
(hash, trace_options),
)
.await
}
Expand All @@ -663,7 +661,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
where
Self: Sync,
{
self.inner.prepare("trace_block", Cow::<BlockNumberOrTag>::Owned(block)).await
self.inner.prepare("trace_block", block).await
}

#[cfg(feature = "anvil")]
Expand All @@ -672,7 +670,7 @@ impl<T: Transport + Clone + Send + Sync> TempProvider for Provider<T> {
Self: Sync,
{
self.inner
.prepare("anvil_setCode", Cow::<(Address, &'static str)>::Owned((address, code)))
.prepare("anvil_setCode", (address, code))
.await
}
}
Expand Down
Loading