github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-28 16:48:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix new clippy lint (#5806)

Browse Source
This commit is contained in:
Matthias Seitz
2023-12-18 09:03:37 +01:00
committed by GitHub
parent 5e7bd64d93
commit fcdd31a6f4
1 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
crates/rpc/rpc/src/eth/api/transactions.rs
View File

@@ -950,45 +950,32 @@ where
l1_block_info: Option<L1BlockInfo>,
block_timestamp: u64,
) -> EthResult<OptimismTxMeta> {
if let Some(l1_block_info) = l1_block_info {
let envelope_buf: Bytes = {
let mut envelope_buf = bytes::BytesMut::default();
tx.encode_enveloped(&mut envelope_buf);
envelope_buf.freeze().into()
};
let Some(l1_block_info) = l1_block_info else { return Ok(OptimismTxMeta::default()) };
let (l1_fee, l1_data_gas) = match (!tx.is_deposit())
.then(|| {
let inner_l1_fee = match l1_block_info.l1_tx_data_fee(
&self.inner.provider.chain_spec(),
block_timestamp,
&envelope_buf,
tx.is_deposit(),
) {
Ok(inner_l1_fee) => inner_l1_fee,
Err(e) => return Err(e),
};
let inner_l1_data_gas = match l1_block_info.l1_data_gas(
&self.inner.provider.chain_spec(),
block_timestamp,
&envelope_buf,
) {
Ok(inner_l1_data_gas) => inner_l1_data_gas,
Err(e) => return Err(e),
};
Ok((inner_l1_fee, inner_l1_data_gas))
})
.transpose()
.map_err(|_| EthApiError::InternalEthError)?
{
Some((l1_fee, l1_data_gas)) => (Some(l1_fee), Some(l1_data_gas)),
None => (None, None),
};
let envelope_buf: Bytes = {
let mut envelope_buf = bytes::BytesMut::new();
tx.encode_enveloped(&mut envelope_buf);
envelope_buf.freeze().into()
};
Ok(OptimismTxMeta::new(Some(l1_block_info), l1_fee, l1_data_gas))
let (l1_fee, l1_data_gas) = if tx.is_deposit() {
let inner_l1_fee = l1_block_info
.l1_tx_data_fee(
&self.inner.provider.chain_spec(),
block_timestamp,
&envelope_buf,
tx.is_deposit(),
)
.map_err(|_| EthApiError::InternalEthError)?;
let inner_l1_data_gas = l1_block_info
.l1_data_gas(&self.inner.provider.chain_spec(), block_timestamp, &envelope_buf)
.map_err(|_| EthApiError::InternalEthError)?;
(Some(inner_l1_fee), Some(inner_l1_data_gas))
} else {
Ok(OptimismTxMeta::default())
}
(None, None)
};
Ok(OptimismTxMeta::new(Some(l1_block_info), l1_fee, l1_data_gas))
}
/// Helper function for `eth_sendRawTransaction` for Optimism.