mirror of
https://github.com/paradigmxyz/reth.git
synced 2026-04-08 03:01:12 -04:00
chore: alloy 0.14 (#15635)
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
@@ -236,7 +236,7 @@ mod tests {
|
||||
#[test]
|
||||
fn simple_insertion() {
|
||||
let mut rng = generators::rng();
|
||||
let parent = rng.gen();
|
||||
let parent = rng.random();
|
||||
let block1 = create_block(&mut rng, 10, parent);
|
||||
let mut buffer = BlockBuffer::new(3);
|
||||
|
||||
@@ -249,11 +249,11 @@ mod tests {
|
||||
fn take_entire_chain_of_children() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent_hash = rng.gen();
|
||||
let main_parent_hash = rng.random();
|
||||
let block1 = create_block(&mut rng, 10, main_parent_hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block3 = create_block(&mut rng, 12, block2.hash());
|
||||
let parent4 = rng.gen();
|
||||
let parent4 = rng.random();
|
||||
let block4 = create_block(&mut rng, 14, parent4);
|
||||
|
||||
let mut buffer = BlockBuffer::new(5);
|
||||
@@ -282,7 +282,7 @@ mod tests {
|
||||
fn take_all_multi_level_children() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent_hash = rng.gen();
|
||||
let main_parent_hash = rng.random();
|
||||
let block1 = create_block(&mut rng, 10, main_parent_hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block3 = create_block(&mut rng, 11, block1.hash());
|
||||
@@ -316,7 +316,7 @@ mod tests {
|
||||
fn take_block_with_children() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent = BlockNumHash::new(9, rng.gen());
|
||||
let main_parent = BlockNumHash::new(9, rng.random());
|
||||
let block1 = create_block(&mut rng, 10, main_parent.hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block3 = create_block(&mut rng, 11, block1.hash());
|
||||
@@ -350,11 +350,11 @@ mod tests {
|
||||
fn remove_chain_of_children() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent = BlockNumHash::new(9, rng.gen());
|
||||
let main_parent = BlockNumHash::new(9, rng.random());
|
||||
let block1 = create_block(&mut rng, 10, main_parent.hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block3 = create_block(&mut rng, 12, block2.hash());
|
||||
let parent4 = rng.gen();
|
||||
let parent4 = rng.random();
|
||||
let block4 = create_block(&mut rng, 14, parent4);
|
||||
|
||||
let mut buffer = BlockBuffer::new(5);
|
||||
@@ -373,7 +373,7 @@ mod tests {
|
||||
fn remove_all_multi_level_children() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent = BlockNumHash::new(9, rng.gen());
|
||||
let main_parent = BlockNumHash::new(9, rng.random());
|
||||
let block1 = create_block(&mut rng, 10, main_parent.hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block3 = create_block(&mut rng, 11, block1.hash());
|
||||
@@ -395,16 +395,16 @@ mod tests {
|
||||
fn remove_multi_chains() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent = BlockNumHash::new(9, rng.gen());
|
||||
let main_parent = BlockNumHash::new(9, rng.random());
|
||||
let block1 = create_block(&mut rng, 10, main_parent.hash);
|
||||
let block1a = create_block(&mut rng, 10, main_parent.hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block2a = create_block(&mut rng, 11, block1.hash());
|
||||
let random_parent1 = rng.gen();
|
||||
let random_parent1 = rng.random();
|
||||
let random_block1 = create_block(&mut rng, 10, random_parent1);
|
||||
let random_parent2 = rng.gen();
|
||||
let random_parent2 = rng.random();
|
||||
let random_block2 = create_block(&mut rng, 11, random_parent2);
|
||||
let random_parent3 = rng.gen();
|
||||
let random_parent3 = rng.random();
|
||||
let random_block3 = create_block(&mut rng, 12, random_parent3);
|
||||
|
||||
let mut buffer = BlockBuffer::new(10);
|
||||
@@ -439,11 +439,11 @@ mod tests {
|
||||
fn evict_with_gap() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent = BlockNumHash::new(9, rng.gen());
|
||||
let main_parent = BlockNumHash::new(9, rng.random());
|
||||
let block1 = create_block(&mut rng, 10, main_parent.hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block3 = create_block(&mut rng, 12, block2.hash());
|
||||
let parent4 = rng.gen();
|
||||
let parent4 = rng.random();
|
||||
let block4 = create_block(&mut rng, 13, parent4);
|
||||
|
||||
let mut buffer = BlockBuffer::new(3);
|
||||
@@ -476,11 +476,11 @@ mod tests {
|
||||
fn simple_eviction() {
|
||||
let mut rng = generators::rng();
|
||||
|
||||
let main_parent = BlockNumHash::new(9, rng.gen());
|
||||
let main_parent = BlockNumHash::new(9, rng.random());
|
||||
let block1 = create_block(&mut rng, 10, main_parent.hash);
|
||||
let block2 = create_block(&mut rng, 11, block1.hash());
|
||||
let block3 = create_block(&mut rng, 12, block2.hash());
|
||||
let parent4 = rng.gen();
|
||||
let parent4 = rng.random();
|
||||
let block4 = create_block(&mut rng, 13, parent4);
|
||||
|
||||
let mut buffer = BlockBuffer::new(3);
|
||||
|
||||
@@ -639,10 +639,10 @@ mod tests {
|
||||
fn measure_storage_cache_overhead() {
|
||||
let (base_overhead, cache) = measure_allocation(|| AccountStorageCache::new(1000));
|
||||
println!("Base AccountStorageCache overhead: {} bytes", base_overhead);
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut rng = rand::rng();
|
||||
|
||||
let key = StorageKey::random();
|
||||
let value = StorageValue::from(rng.gen::<u128>());
|
||||
let value = StorageValue::from(rng.random::<u128>());
|
||||
let (first_slot, _) = measure_allocation(|| {
|
||||
cache.insert_storage(key, Some(value));
|
||||
});
|
||||
@@ -652,7 +652,7 @@ mod tests {
|
||||
let (test_slots, _) = measure_allocation(|| {
|
||||
for _ in 0..TOTAL_SLOTS {
|
||||
let key = StorageKey::random();
|
||||
let value = StorageValue::from(rng.gen::<u128>());
|
||||
let value = StorageValue::from(rng.random::<u128>());
|
||||
cache.insert_storage(key, Some(value));
|
||||
}
|
||||
});
|
||||
|
||||
@@ -426,6 +426,7 @@ mod tests {
|
||||
StateProviderBuilder, TreeConfig,
|
||||
};
|
||||
use alloy_evm::block::StateChangeSource;
|
||||
use rand::Rng;
|
||||
use reth_chainspec::ChainSpec;
|
||||
use reth_db_common::init::init_genesis;
|
||||
use reth_ethereum_primitives::EthPrimitives;
|
||||
@@ -437,38 +438,41 @@ mod tests {
|
||||
test_utils::create_test_provider_factory_with_chain_spec,
|
||||
ChainSpecProvider, HashingWriter,
|
||||
};
|
||||
use reth_testing_utils::generators::{self, Rng};
|
||||
use reth_testing_utils::generators;
|
||||
use reth_trie::{test_utils::state_root, HashedPostState, TrieInput};
|
||||
use revm_primitives::{Address, HashMap, B256, KECCAK_EMPTY, U256};
|
||||
use revm_state::{AccountInfo, AccountStatus, EvmState, EvmStorageSlot};
|
||||
|
||||
fn create_mock_state_updates(num_accounts: usize, updates_per_account: usize) -> Vec<EvmState> {
|
||||
let mut rng = generators::rng();
|
||||
let all_addresses: Vec<Address> = (0..num_accounts).map(|_| rng.gen()).collect();
|
||||
let all_addresses: Vec<Address> = (0..num_accounts).map(|_| rng.random()).collect();
|
||||
let mut updates = Vec::new();
|
||||
|
||||
for _ in 0..updates_per_account {
|
||||
let num_accounts_in_update = rng.gen_range(1..=num_accounts);
|
||||
let num_accounts_in_update = rng.random_range(1..=num_accounts);
|
||||
let mut state_update = EvmState::default();
|
||||
|
||||
let selected_addresses = &all_addresses[0..num_accounts_in_update];
|
||||
|
||||
for &address in selected_addresses {
|
||||
let mut storage = HashMap::default();
|
||||
if rng.gen_bool(0.7) {
|
||||
for _ in 0..rng.gen_range(1..10) {
|
||||
let slot = U256::from(rng.gen::<u64>());
|
||||
if rng.random_bool(0.7) {
|
||||
for _ in 0..rng.random_range(1..10) {
|
||||
let slot = U256::from(rng.random::<u64>());
|
||||
storage.insert(
|
||||
slot,
|
||||
EvmStorageSlot::new_changed(U256::ZERO, U256::from(rng.gen::<u64>())),
|
||||
EvmStorageSlot::new_changed(
|
||||
U256::ZERO,
|
||||
U256::from(rng.random::<u64>()),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
let account = revm_state::Account {
|
||||
info: AccountInfo {
|
||||
balance: U256::from(rng.gen::<u64>()),
|
||||
nonce: rng.gen::<u64>(),
|
||||
balance: U256::from(rng.random::<u64>()),
|
||||
nonce: rng.random::<u64>(),
|
||||
code_hash: KECCAK_EMPTY,
|
||||
code: Some(Default::default()),
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user