Revert accidental beta regressions.

This commit is contained in:
Gav Wood 2016-03-07 08:01:14 +01:00
parent fd87633db6
commit 73207c2355

View File

@ -351,7 +351,7 @@ impl JournalDB {
fn read_counters(db: &Database) -> HashMap<H256, i32> { fn read_counters(db: &Database) -> HashMap<H256, i32> {
let mut counters = HashMap::new(); let mut counters = HashMap::new();
if let Some(val) = db.get(&LATEST_ERA_KEY).expect("Low-level database error.") { if let Some(val) = db.get(&LATEST_ERA_KEY).expect("Low-level database error.") {
let mut era = decode::<u64>(&val) + 1; let mut era = decode::<u64>(&val);
loop { loop {
let mut index = 0usize; let mut index = 0usize;
while let Some(rlp_data) = db.get({ while let Some(rlp_data) = db.get({
@ -366,10 +366,10 @@ impl JournalDB {
Self::replay_keys(&inserts, db, &mut counters); Self::replay_keys(&inserts, db, &mut counters);
index += 1; index += 1;
}; };
if index == 0 { if index == 0 || era == 0 {
break; break;
} }
era += 1; era -= 1;
} }
} }
trace!("Recovered {} counters", counters.len()); trace!("Recovered {} counters", counters.len());