Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

2 tiny modification on snapshot #8601

Merged
merged 11 commits into from
May 12, 2018
Merged

2 tiny modification on snapshot #8601

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e833606
Some tiny modifications.
EighteenZi Mar 20, 2018
f913c03
Merge pull request #1 from paritytech/master
EighteenZi Mar 21, 2018
3d781c4
Merge pull request #2 from paritytech/master
EighteenZi Apr 9, 2018
23947c3
Remove the clone of code_cache, as it has been done in clone_basic.
EighteenZi Apr 9, 2018
92ecda6
Merge pull request #3 from paritytech/master
EighteenZi Apr 13, 2018
84778b1
remove From::from. It seems not necessary.
EighteenZi Apr 13, 2018
91482a0
Merge pull request #4 from paritytech/master
EighteenZi Apr 20, 2018
45624b3
change mode: remove rust files' executable mode.
EighteenZi Apr 20, 2018
0d3eda1
Merge pull request #5 from paritytech/master
EighteenZi May 11, 2018
7037857
2 tiny modifications on snapshot.
EighteenZi May 11, 2018
f080d37
Merge pull request #6 from paritytech/master
EighteenZi May 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ethcore/src/snapshot/consensus/work.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ impl Rebuilder for PowRebuilder {
let item_count = rlp.item_count()?;
let num_blocks = (item_count - 3) as u64;

trace!(target: "snapshot", "restoring block chunk with {} blocks.", item_count - 3);
trace!(target: "snapshot", "restoring block chunk with {} blocks.", num_blocks);

if self.fed_blocks + num_blocks > self.snapshot_blocks {
return Err(Error::TooManyBlocks(self.snapshot_blocks, self.fed_blocks + num_blocks).into())
Expand Down
2 changes: 1 addition & 1 deletion ethcore/src/snapshot/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ impl Restoration {
// verify final state root.
let root = self.state.state_root();
if root != self.final_state_root {
warn!("Final restored state has wrong state root: expected {:?}, got {:?}", root, self.final_state_root);
warn!("Final restored state has wrong state root: expected {:?}, got {:?}", self.final_state_root, root);
return Err(TrieError::InvalidStateRoot(root).into());
}

Expand Down