Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 04:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup usage of legacy bitmaps. (#3455)

Browse source 
The legacy bitmaps are no longer required and
have not been in use for a while.
This commit is contained in:
Antioch Peverell 2020-10-02 14:40:04 +01:00 committed by GitHub
parent f25b7ae032
commit c3b1ccff3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
chain/src/store.rs
View file

@ -42,7 +42,6 @@ pub const NRD_KERNEL_LIST_PREFIX: u8 = b'K';
/// Prefix for NRD kernel pos index entries. /// Prefix for NRD kernel pos index entries.
pub const NRD_KERNEL_ENTRY_PREFIX: u8 = b'k'; pub const NRD_KERNEL_ENTRY_PREFIX: u8 = b'k';
const BLOCK_INPUT_BITMAP_PREFIX: u8 = b'B';
const BLOCK_SUMS_PREFIX: u8 = b'M'; const BLOCK_SUMS_PREFIX: u8 = b'M';
const BLOCK_SPENT_PREFIX: u8 = b'S'; const BLOCK_SPENT_PREFIX: u8 = b'S';
@ -319,9 +318,6 @@ impl<'a> Batch<'a> {
/// Delete the block spent index. /// Delete the block spent index.
fn delete_spent_index(&self, bh: &Hash) -> Result<(), Error> { fn delete_spent_index(&self, bh: &Hash) -> Result<(), Error> {
// Clean up the legacy input bitmap as well.
let _ = self.db.delete(&to_key(BLOCK_INPUT_BITMAP_PREFIX, bh));
self.db.delete(&to_key(BLOCK_SPENT_PREFIX, bh)) self.db.delete(&to_key(BLOCK_SPENT_PREFIX, bh))
} }
@ -345,25 +341,12 @@ impl<'a> Batch<'a> {
/// Get the block input bitmap based on our spent index. /// Get the block input bitmap based on our spent index.
/// Fallback to legacy block input bitmap from the db. /// Fallback to legacy block input bitmap from the db.
pub fn get_block_input_bitmap(&self, bh: &Hash) -> Result<Bitmap, Error> { pub fn get_block_input_bitmap(&self, bh: &Hash) -> Result<Bitmap, Error> {
if let Ok(spent) = self.get_spent_index(bh) { let bitmap = self
let bitmap = spent .get_spent_index(bh)?
.into_iter() .into_iter()
.map(|x| x.pos.try_into().unwrap()) .map(|x| x.pos.try_into().unwrap())
.collect(); .collect();
Ok(bitmap) Ok(bitmap)
} else {
self.get_legacy_input_bitmap(bh)
}
}
fn get_legacy_input_bitmap(&self, bh: &Hash) -> Result<Bitmap, Error> {
option_to_not_found(
self.db
.get_with(&to_key(BLOCK_INPUT_BITMAP_PREFIX, bh), |data| {
Ok(Bitmap::deserialize(data))
}),
|| "legacy block input bitmap".to_string(),
)
} }
/// Get the "spent index" from the db for the specified block. /// Get the "spent index" from the db for the specified block.