pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-05 01:37:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: fix decode block number as u32 (#3130)

Browse Source 
* client: fix panic on decode block number as u32

* client: add test for number_index_key

* client: add another test at client level

* client: address review grumbles
This commit is contained in:
André Silva
2019-07-18 15:55:14 +01:00
committed by GitHub
parent e8a2fee6d6
commit 991e9ae263
4 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/client/db/src/light.rs
+14 -14
View File
@@ -211,7 +211,7 @@ impl<Block: BlockT> LightStorage<Block> {
/// should be the parent of `best_to`. In the case where we set an existing block
/// to be best, `route_to` should equal to `best_to`.
fn set_head_with_transaction(&self, transaction: &mut DBTransaction, route_to: Block::Hash, best_to: (NumberFor<Block>, Block::Hash)) -> Result<(), client::error::Error> {
let lookup_key = utils::number_and_hash_to_lookup_key(best_to.0, &best_to.1);
let lookup_key = utils::number_and_hash_to_lookup_key(best_to.0, &best_to.1)?;
// handle reorg.
let meta = self.meta.read();
@@ -234,7 +234,7 @@ impl<Block: BlockT> LightStorage<Block> {
transaction,
columns::KEY_LOOKUP,
retracted.number
);
)?;
}
for enacted in tree_route.enacted() {
@@ -243,7 +243,7 @@ impl<Block: BlockT> LightStorage<Block> {
columns::KEY_LOOKUP,
enacted.number,
enacted.hash
);
)?;
}
}
@@ -253,7 +253,7 @@ impl<Block: BlockT> LightStorage<Block> {
columns::KEY_LOOKUP,
best_to.0,
best_to.1,
);
)?;
Ok(())
}
@@ -274,7 +274,7 @@ impl<Block: BlockT> LightStorage<Block> {
).into())
}
let lookup_key = utils::number_and_hash_to_lookup_key(header.number().clone(), hash);
let lookup_key = utils::number_and_hash_to_lookup_key(header.number().clone(), hash)?;
transaction.put(columns::META, meta_keys::FINALIZED_BLOCK, &lookup_key);
// build new CHT(s) if required
@@ -293,7 +293,7 @@ impl<Block: BlockT> LightStorage<Block> {
)?;
transaction.put(
columns::CHT,
&cht_key(HEADER_CHT_PREFIX, new_cht_start),
&cht_key(HEADER_CHT_PREFIX, new_cht_start)?,
new_header_cht_root.as_ref()
);
@@ -311,7 +311,7 @@ impl<Block: BlockT> LightStorage<Block> {
)?;
transaction.put(
columns::CHT,
&cht_key(CHANGES_TRIE_CHT_PREFIX, new_cht_start),
&cht_key(CHANGES_TRIE_CHT_PREFIX, new_cht_start)?,
new_changes_trie_cht_root.as_ref()
);
}
@@ -331,7 +331,7 @@ impl<Block: BlockT> LightStorage<Block> {
columns::KEY_LOOKUP,
prune_block,
hash
);
)?;
transaction.delete(columns::HEADER, &lookup_key);
}
prune_block += One::one();
@@ -358,7 +358,7 @@ impl<Block: BlockT> LightStorage<Block> {
let cht_number = cht::block_to_cht_number(cht_size, block).ok_or_else(no_cht_for_block)?;
let cht_start = cht::start_number(cht_size, cht_number);
self.db.get(columns::CHT, &cht_key(cht_type, cht_start)).map_err(db_err)?
self.db.get(columns::CHT, &cht_key(cht_type, cht_start)?).map_err(db_err)?
.ok_or_else(no_cht_for_block)
.and_then(|hash| Block::Hash::decode(&mut &*hash).ok_or_else(no_cht_for_block))
}
@@ -414,7 +414,7 @@ impl<Block> LightBlockchainStorage<Block> for LightStorage<Block>
}
// blocks are keyed by number + hash.
let lookup_key = utils::number_and_hash_to_lookup_key(number, &hash);
let lookup_key = utils::number_and_hash_to_lookup_key(number, &hash)?;
if leaf_state.is_best() {
self.set_head_with_transaction(&mut transaction, parent_hash, (number, hash))?;
@@ -425,7 +425,7 @@ impl<Block> LightBlockchainStorage<Block> for LightStorage<Block>
columns::KEY_LOOKUP,
number,
hash,
);
)?;
transaction.put(columns::HEADER, &lookup_key, &header.encode());
let is_genesis = number.is_zero();
@@ -562,10 +562,10 @@ impl<Block> LightBlockchainStorage<Block> for LightStorage<Block>
}
/// Build the key for inserting header-CHT at given block.
fn cht_key<N: TryInto<u32>>(cht_type: u8, block: N) -> [u8; 5] {
fn cht_key<N: TryInto<u32>>(cht_type: u8, block: N) -> ClientResult<[u8; 5]> {
let mut key = [cht_type; 5];
key[1..].copy_from_slice(&utils::number_index_key(block));
key
key[1..].copy_from_slice(&utils::number_index_key(block)?);
Ok(key)
}
#[cfg(test)]