chore: update revm and alloy primitives (#11235)

Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com>
This commit is contained in:
Matthias Seitz
2024-09-26 16:33:29 +02:00
committed by GitHub
parent 3a255a1cab
commit 6a7d8938c7
53 changed files with 254 additions and 230 deletions

View File

@ -1,7 +1,7 @@
//! Dummy blocks and data for tests
use crate::{DatabaseProviderRW, ExecutionOutcome};
use alloy_consensus::TxLegacy;
use alloy_primitives::{Address, BlockNumber, Log, Parity, Sealable, TxKind};
use alloy_primitives::{map::HashMap, Address, BlockNumber, Log, Parity, Sealable, TxKind};
use once_cell::sync::Lazy;
use reth_db::tables;
use reth_db_api::{database::Database, models::StoredBlockBodyIndices};
@ -11,10 +11,7 @@ use reth_primitives::{
TxType, Withdrawal, Withdrawals, B256, U256,
};
use reth_trie::root::{state_root_unhashed, storage_root_unhashed};
use revm::{
db::BundleState,
primitives::{AccountInfo, HashMap},
};
use revm::{db::BundleState, primitives::AccountInfo};
use std::str::FromStr;
/// Assert genesis block
@ -200,7 +197,7 @@ fn block1(number: BlockNumber) -> (SealedBlockWithSenders, ExecutionOutcome) {
.revert_account_info(number, account1, Some(None))
.state_present_account_info(account2, info)
.revert_account_info(number, account2, Some(None))
.state_storage(account1, HashMap::from([(slot, (U256::ZERO, U256::from(10)))]))
.state_storage(account1, HashMap::from_iter([(slot, (U256::ZERO, U256::from(10)))]))
.build(),
vec![vec![Some(Receipt {
tx_type: TxType::Eip2930,
@ -256,7 +253,7 @@ fn block2(
account,
AccountInfo { nonce: 3, balance: U256::from(20), ..Default::default() },
)
.state_storage(account, HashMap::from([(slot, (U256::ZERO, U256::from(15)))]))
.state_storage(account, HashMap::from_iter([(slot, (U256::ZERO, U256::from(15)))]))
.revert_account_info(
number,
account,