move PoH verification off bank.last_id() (#1476)
This commit is contained in:
parent
041040c659
commit
14a9ef4bbe
|
@ -106,7 +106,6 @@ fn main() {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
let bank = Bank::default();
|
let bank = Bank::default();
|
||||||
|
|
||||||
{
|
{
|
||||||
let genesis = match read_ledger(ledger_path, true) {
|
let genesis = match read_ledger(ledger_path, true) {
|
||||||
Ok(entries) => entries,
|
Ok(entries) => entries,
|
||||||
|
@ -127,16 +126,22 @@ fn main() {
|
||||||
let entries = entries.map(|e| e.unwrap());
|
let entries = entries.map(|e| e.unwrap());
|
||||||
|
|
||||||
let head = head - 2;
|
let head = head - 2;
|
||||||
|
|
||||||
|
let mut last_id = bank.last_id();
|
||||||
|
|
||||||
for (i, entry) in entries.skip(2).enumerate() {
|
for (i, entry) in entries.skip(2).enumerate() {
|
||||||
if i >= head {
|
if i >= head {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if !entry.verify(&bank.last_id()) {
|
|
||||||
|
if !entry.verify(&last_id) {
|
||||||
eprintln!("entry.verify() failed at entry[{}]", i + 2);
|
eprintln!("entry.verify() failed at entry[{}]", i + 2);
|
||||||
if !matches.is_present("continue") {
|
if !matches.is_present("continue") {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
last_id = entry.id;
|
||||||
|
|
||||||
if let Err(e) = bank.process_entry(&entry) {
|
if let Err(e) = bank.process_entry(&entry) {
|
||||||
eprintln!("verify failed at entry[{}], err: {:?}", i + 2, e);
|
eprintln!("verify failed at entry[{}], err: {:?}", i + 2, e);
|
||||||
if !matches.is_present("continue") {
|
if !matches.is_present("continue") {
|
||||||
|
|
Loading…
Reference in New Issue