jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Alloy migration (#4737)

Browse Source 
Co-authored-by: Alessandro Mazza <121622391+alessandromazza98@users.noreply.github.com>
Co-authored-by: Supernovahs.eth <91280922+supernovahs@users.noreply.github.com>
Co-authored-by: Oliver Nordbjerg <hi@notbjerg.me>
This commit is contained in:
DaniPopes
2023-09-28 17:55:39 +02:00
committed by GitHub
parent 3ef0364e42
commit 5f9a917fb1
348 changed files with 3593 additions and 7066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
crates/blockchain-tree/src/block_buffer.rs
View File

@ -215,13 +215,13 @@ impl BlockBuffer {
#[cfg(test)]
mod tests {
use reth_interfaces::test_utils::generators;
use std::collections::HashMap;
use reth_interfaces::test_utils::generators::{random_block, Rng};
use reth_primitives::{BlockHash, BlockNumHash, SealedBlockWithSenders};
use crate::BlockBuffer;
use reth_interfaces::test_utils::{
generators,
generators::{random_block, Rng},
};
use reth_primitives::{BlockHash, BlockNumHash, SealedBlockWithSenders};
use std::collections::HashMap;
fn create_block<R: Rng>(rng: &mut R, number: u64, parent: BlockHash) -> SealedBlockWithSenders {
let block = random_block(rng, number, Some(parent), None, None);
@ -231,7 +231,8 @@ mod tests {
#[test]
fn simple_insertion() {
let mut rng = generators::rng();
let block1 = create_block(&mut rng, 10, BlockHash::random());
let parent = rng.gen();
let block1 = create_block(&mut rng, 10, parent);
let mut buffer = BlockBuffer::new(3);
buffer.insert_block(block1.clone());
@ -244,11 +245,12 @@ mod tests {
fn take_all_chain_of_childrens() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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 block4 = create_block(&mut rng, 14, BlockHash::random());
let parent4 = rng.gen();
let block4 = create_block(&mut rng, 14, parent4);
let mut buffer = BlockBuffer::new(5);
@ -273,7 +275,7 @@ mod tests {
fn take_all_multi_level_childrens() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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);
@ -307,7 +309,7 @@ mod tests {
fn take_self_with_childs() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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);
@ -341,11 +343,12 @@ mod tests {
fn clean_chain_of_children() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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 block4 = create_block(&mut rng, 14, BlockHash::random());
let parent4 = rng.gen();
let block4 = create_block(&mut rng, 14, parent4);
let mut buffer = BlockBuffer::new(5);
@ -363,7 +366,7 @@ mod tests {
fn clean_all_multi_level_childrens() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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);
@ -385,14 +388,17 @@ mod tests {
fn clean_multi_chains() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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_block1 = create_block(&mut rng, 10, BlockHash::random());
let random_block2 = create_block(&mut rng, 11, BlockHash::random());
let random_block3 = create_block(&mut rng, 12, BlockHash::random());
let random_parent1 = rng.gen();
let random_block1 = create_block(&mut rng, 10, random_parent1);
let random_parent2 = rng.gen();
let random_block2 = create_block(&mut rng, 11, random_parent2);
let random_parent3 = rng.gen();
let random_block3 = create_block(&mut rng, 12, random_parent3);
let mut buffer = BlockBuffer::new(10);
@ -436,11 +442,12 @@ mod tests {
fn evict_with_gap() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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 block4 = create_block(&mut rng, 13, BlockHash::random());
let parent4 = rng.gen();
let block4 = create_block(&mut rng, 13, parent4);
let mut buffer = BlockBuffer::new(3);
@ -472,11 +479,12 @@ mod tests {
fn simple_eviction() {
let mut rng = generators::rng();
let main_parent = BlockNumHash::new(9, BlockHash::random());
let main_parent = BlockNumHash::new(9, rng.gen());
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 block4 = create_block(&mut rng, 13, BlockHash::random());
let parent4 = rng.gen();
let block4 = create_block(&mut rng, 13, parent4);
let mut buffer = BlockBuffer::new(3);

18
crates/blockchain-tree/src/blockchain_tree.rs
View File

@ -1178,7 +1178,7 @@ mod tests {
use reth_db::{test_utils::create_test_rw_db, transaction::DbTxMut, DatabaseEnv};
use reth_interfaces::test_utils::TestConsensus;
use reth_primitives::{
proofs::EMPTY_ROOT, stage::StageCheckpoint, ChainSpecBuilder, H256, MAINNET,
proofs::EMPTY_ROOT, stage::StageCheckpoint, ChainSpecBuilder, B256, MAINNET,
};
use reth_provider::{
test_utils::{blocks::BlockChainTestData, TestExecutorFactory},
@ -1218,7 +1218,7 @@ mod tests {
for i in 0..10 {
provider
.tx_ref()
.put::<tables::CanonicalHeaders>(i, H256([100 + i as u8; 32]))
.put::<tables::CanonicalHeaders>(i, B256::new([100 + i as u8; 32]))
.unwrap();
}
provider
@ -1321,10 +1321,10 @@ mod tests {
BlockchainTree::new(externals, sender, config, None).expect("failed to create tree");
// genesis block 10 is already canonical
tree.make_canonical(&H256::zero()).unwrap();
tree.make_canonical(&B256::ZERO).unwrap();
// make sure is_block_hash_canonical returns true for genesis block
tree.is_block_hash_canonical(&H256::zero()).unwrap();
tree.is_block_hash_canonical(&B256::ZERO).unwrap();
// make genesis block 10 as finalized
tree.finalize_block(10);
@ -1356,7 +1356,7 @@ mod tests {
);
// check if random block is known
let old_block = BlockNumHash::new(1, H256([32; 32]));
let old_block = BlockNumHash::new(1, B256::new([32; 32]));
let err = BlockchainTreeError::PendingBlockIsFinalized { last_finalized: 10 };
assert_eq!(tree.is_block_known(old_block).unwrap_err().as_tree_error(), Some(err));
@ -1424,10 +1424,10 @@ mod tests {
/**** INSERT SIDE BLOCKS *** */
let mut block1a = block1.clone();
let block1a_hash = H256([0x33; 32]);
let block1a_hash = B256::new([0x33; 32]);
block1a.hash = block1a_hash;
let mut block2a = block2.clone();
let block2a_hash = H256([0x34; 32]);
let block2a_hash = B256::new([0x34; 32]);
block2a.hash = block2a_hash;
// reinsert two blocks that point to canonical chain
@ -1627,8 +1627,8 @@ mod tests {
// insert unconnected block2b
let mut block2b = block2a.clone();
block2b.hash = H256([0x99; 32]);
block2b.parent_hash = H256([0x88; 32]);
block2b.hash = B256::new([0x99; 32]);
block2b.parent_hash = B256::new([0x88; 32]);
assert_eq!(
tree.insert_block(block2b.clone()).unwrap(),