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

chore: use DatabaseProviderRW instead of TX on insert_genesis_header (#9452)

Browse Source
This commit is contained in:
joshieDo
2024-07-11 20:56:20 +02:00
committed by GitHub
parent 112b2332e3
commit c31d69683d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cli/commands/src/stage/drop.rs
View File

@ -68,7 +68,7 @@ impl Command {
StageId::Headers.to_string(),
Default::default(),
)?;
insert_genesis_header::<DatabaseEnv>(tx, &static_file_provider, self.env.chain)?;
insert_genesis_header(&provider_rw, &static_file_provider, self.env.chain)?;
}
StageEnum::Bodies => {
tx.clear::<tables::BlockBodyIndices>()?;
@ -81,7 +81,7 @@ impl Command {
StageId::Bodies.to_string(),
Default::default(),
)?;
insert_genesis_header::<DatabaseEnv>(tx, &static_file_provider, self.env.chain)?;
insert_genesis_header(&provider_rw, &static_file_provider, self.env.chain)?;
}
StageEnum::Senders => {
tx.clear::<tables::TransactionSenders>()?;
@ -168,7 +168,7 @@ impl Command {
StageId::TransactionLookup.to_string(),
Default::default(),
)?;
insert_genesis_header::<DatabaseEnv>(tx, &static_file_provider, self.env.chain)?;
insert_genesis_header(&provider_rw, &static_file_provider, self.env.chain)?;
}
}

8
crates/storage/db-common/src/init.rs
View File

@ -115,7 +115,7 @@ pub fn init_genesis<DB: Database>(factory: ProviderFactory<DB>) -> Result<B256,
// Insert header
let tx = provider_rw.tx_ref();
let static_file_provider = factory.static_file_provider();
insert_genesis_header::<DB>(tx, &static_file_provider, chain.clone())?;
insert_genesis_header(&provider_rw, &static_file_provider, chain.clone())?;
insert_genesis_state::<DB>(tx, alloc.len(), alloc.iter())?;
@ -274,7 +274,7 @@ pub fn insert_history<'a, 'b, DB: Database>(
/// Inserts header for the genesis state.
pub fn insert_genesis_header<DB: Database>(
tx: &<DB as Database>::TXMut,
provider: &DatabaseProviderRW<DB>,
static_file_provider: &StaticFileProvider,
chain: Arc<ChainSpec>,
) -> ProviderResult<()> {
@ -290,8 +290,8 @@ pub fn insert_genesis_header<DB: Database>(
Err(e) => return Err(e),
}
tx.put::<tables::HeaderNumbers>(block_hash, 0)?;
tx.put::<tables::BlockBodyIndices>(0, Default::default())?;
provider.tx_ref().put::<tables::HeaderNumbers>(block_hash, 0)?;
provider.tx_ref().put::<tables::BlockBodyIndices>(0, Default::default())?;
Ok(())
}