pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-29 16:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

State db random fixes (#802)

Browse Source 
* state-db: typo fixes

* use fmt::Result for 'fmt'

* state-db: typo fixes

* state-db: use the same pattern to pass the parameter

* state-db: follow the same style
This commit is contained in:
Guanqun Lu
2018-09-26 18:15:56 +08:00
committed by Gav Wood
parent 52dbf0cace
commit 74a5ff7d0d
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/state-db/src/lib.rs
+4 -4
View File
@@ -21,9 +21,9 @@
//!
//! # Canonicalization.
//! Canonicalization window tracks a tree of blocks identified by header hash. The in-memory
//! overlay allows to get any node that was was inserted in any any of the blocks within the window.
//! overlay allows to get any node that was inserted in any of the blocks within the window.
//! The tree is journaled to the backing database and rebuilt on startup.
//! Canonicalization function select one root from the top of the tree and discards all other roots and
//! Canonicalization function selects one root from the top of the tree and discards all other roots and
//! their subtrees.
//!
//! # Pruning.
@@ -83,7 +83,7 @@ pub enum Error<E: fmt::Debug> {
}
impl<E: fmt::Debug> fmt::Debug for Error<E> {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
Error::Db(e) => e.fmt(f),
Error::Decoding => write!(f, "Error decoding slicable value"),
@@ -174,7 +174,7 @@ impl<BlockHash: Hash, Key: Hash> StateDbSync<BlockHash, Key> {
Ok(StateDbSync {
mode,
non_canonical,
pruning: pruning,
pruning,
pinned: Default::default(),
})
}
substrate/core/state-db/src/noncanonical.rs
+3 -3
View File
@@ -103,7 +103,7 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
trace!(target: "state-db", "Finished reading uncanonicalized journal, {} entries", total);
}
Ok(NonCanonicalOverlay {
last_canonicalized: last_canonicalized,
last_canonicalized,
levels,
parents,
last_canonicalized_overlay: Default::default(),
@@ -212,8 +212,8 @@ impl<BlockHash: Hash, Key: Hash> NonCanonicalOverlay<BlockHash, Key> {
commit.data.inserted = self.last_canonicalized_overlay.iter().map(|(k, v)| (k.clone(), v.clone())).collect();
commit.data.deleted = overlay.deleted;
} else {
// TODO: borrow checker won't allow us to split out mutable refernces
// required for recursive processing. A more efficient implementaion
// TODO: borrow checker won't allow us to split out mutable references
// required for recursive processing. A more efficient implementation
// that does not require converting to vector is possible
let mut vec: Vec<_> = self.levels.drain(..).collect();
Self::discard(&mut vec, &mut self.parents, &mut discarded_journals, 0, &overlay.hash);