pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 12:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed pruning detection in archive mode (#1670)

Browse Source
This commit is contained in:
Arkadiy Paronyan
2019-02-04 15:30:05 +01:00
committed by Bastian Köcher
parent 1a3fa9eb68
commit 38d7eb66a7
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/state-db/src/lib.rs
+11 -5
View File
@@ -231,10 +231,15 @@ impl<BlockHash: Hash, Key: Hash> StateDbSync<BlockHash, Key> {
} }
pub fn is_pruned(&self, hash: &BlockHash, number: u64) -> bool { pub fn is_pruned(&self, hash: &BlockHash, number: u64) -> bool {
if self.best_canonical().map(|c| number > c).unwrap_or(true) { match self.mode {
!self.non_canonical.have_block(hash) PruningMode::ArchiveAll => false,
} else { PruningMode::ArchiveCanonical | PruningMode::Constrained(_) => {
self.pruning.as_ref().map_or(false, |pruning| number < pruning.pending() || !pruning.have_block(hash)) if self.best_canonical().map(|c| number > c).unwrap_or(true) {
!self.non_canonical.have_block(hash)
} else {
self.pruning.as_ref().map_or(false, |pruning| number < pruning.pending() || !pruning.have_block(hash))
}
}
} }
} }
@@ -451,8 +456,9 @@ mod tests {
#[test] #[test]
fn full_archive_keeps_everything() { fn full_archive_keeps_everything() {
let (db, _) = make_test_db(PruningMode::ArchiveAll); let (db, sdb) = make_test_db(PruningMode::ArchiveAll);
assert!(db.data_eq(&make_db(&[1, 21, 22, 3, 4, 91, 921, 922, 93, 94]))); assert!(db.data_eq(&make_db(&[1, 21, 22, 3, 4, 91, 921, 922, 93, 94])));
assert!(!sdb.is_pruned(&H256::from_low_u64_be(0), 0));
} }
#[test] #[test]