Skip to content

refactor(l1): dedup the canonical-block-hash read onto load_canonical_block_hash #7189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ilitteri wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(l1): dedup the canonical-block-hash read onto load_canonical_block_hash #7189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions crates/storage/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,20 +1209,10 @@ impl Store {
if last.number == block_number {
return Ok(Some(last.hash()));
}
let backend = self.backend.clone();
tokio::task::spawn_blocking(move || {
backend
.begin_read()?
.get(
CANONICAL_BLOCK_HASHES,
block_number.to_le_bytes().as_slice(),
)?
.map(|bytes| H256::decode(bytes.as_slice()))
.transpose()
.map_err(StoreError::from)
})
.await
.map_err(|e| StoreError::Custom(format!("Task panicked: {}", e)))?
let store = self.clone();
tokio::task::spawn_blocking(move || store.load_canonical_block_hash(block_number))
.await
.map_err(|e| StoreError::Custom(format!("Task panicked: {}", e)))?
}

/// Stores the chain configuration values, should only be called once after reading the genesis file
Expand Down Expand Up @@ -1604,14 +1594,7 @@ impl Store {
if last.number == block_number {
return Ok(Some(last.hash()));
}
let txn = self.backend.begin_read()?;
txn.get(
CANONICAL_BLOCK_HASHES,
block_number.to_le_bytes().as_slice(),
)?
.map(|bytes| H256::decode(bytes.as_slice()))
.transpose()
.map_err(StoreError::from)
self.load_canonical_block_hash(block_number)
}

/// CAUTION: This method writes directly to the underlying database, bypassing any caching layer.
Expand Down
Loading