github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-29 17:18:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: use proper option condition in HistoricalStateProvider (#1958)

Browse Source
This commit is contained in:
Dan Cline
2023-03-24 06:04:34 -04:00
committed by GitHub
parent c5f197dd95
commit ee52718ab0
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/storage/provider/src/providers/state/historical.rs
View File

@@ -43,15 +43,17 @@ impl<'a, 'b, TX: DbTx<'a>> AccountProvider for HistoricalStateProviderRef<'a, 'b
// history key to search IntegerList of transition id changesets.
let history_key = ShardedKey::new(address, self.transition);
let Some(changeset_transition_id) = self.tx.cursor_read::<tables::AccountHistory>()?
let changeset_transition_id = self
.tx
.cursor_read::<tables::AccountHistory>()?
.seek(history_key)?
.filter(|(key,_)| key.key == address)
.map(|(_,list)| list.0.enable_rank().successor(self.transition as usize).map(|i| i as u64)) else {
return Ok(None)
};
.filter(|(key, _)| key.key == address)
.map(|(_, list)| {
list.0.enable_rank().successor(self.transition as usize).map(|i| i as u64)
});
// if changeset transition id is present we are getting value from changeset
if let Some(changeset_transition_id) = changeset_transition_id {
if let Some(Some(changeset_transition_id)) = changeset_transition_id {
let account = self
.tx
.cursor_dup_read::<tables::AccountChangeSet>()?
@@ -96,15 +98,17 @@ impl<'a, 'b, TX: DbTx<'a>> StateProvider for HistoricalStateProviderRef<'a, 'b,
// history key to search IntegerList of transition id changesets.
let history_key = StorageShardedKey::new(address, storage_key, self.transition);
let Some(changeset_transition_id) = self.tx.cursor_read::<tables::StorageHistory>()?
let changeset_transition_id = self
.tx
.cursor_read::<tables::StorageHistory>()?
.seek(history_key)?
.filter(|(key,_)| key.address == address && key.sharded_key.key == storage_key)
.map(|(_,list)| list.0.enable_rank().successor(self.transition as usize).map(|i| i as u64)) else {
return Ok(None)
};
.filter(|(key, _)| key.address == address && key.sharded_key.key == storage_key)
.map(|(_, list)| {
list.0.enable_rank().successor(self.transition as usize).map(|i| i as u64)
});
// if changeset transition id is present we are getting value from changeset
if let Some(changeset_transition_id) = changeset_transition_id {
if let Some(Some(changeset_transition_id)) = changeset_transition_id {
let storage_entry = self
.tx
.cursor_dup_read::<tables::StorageChangeSet>()?