Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 08:51:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup and stop wrapping errors in other/unfit (#3616)

Browse source
This commit is contained in:
Antioch Peverell 2021-03-30 09:12:48 +01:00 committed by GitHub
parent 25d93c8606
commit 09c90fc257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
chain/src/chain.rs
View file

@ -363,63 +363,33 @@ impl Chain {
// Only do this once we know the header PoW is valid.
self.check_orphan(&b, opts)?;
let (maybe_new_head, prev_head) = {
let (head, fork_point, prev_head) = {
let mut header_pmmr = self.header_pmmr.write();
let mut txhashset = self.txhashset.write();
let batch = self.store.batch()?;
let prev_head = batch.head()?;
let mut ctx = self.new_ctx(opts, batch, &mut header_pmmr, &mut txhashset)?;
let maybe_new_head = pipe::process_block(&b, &mut ctx);
let (head, fork_point) = pipe::process_block(&b, &mut ctx)?;
// We have flushed txhashset extension changes to disk
// but not yet committed the batch.
// A node shutdown at this point can be catastrophic...
// We prevent this via the stop_lock (see above).
if maybe_new_head.is_ok() {
ctx.batch.commit()?;
}
ctx.batch.commit()?;
// release the lock and let the batch go before post-processing
(maybe_new_head, prev_head)
(head, fork_point, prev_head)
};
match maybe_new_head {
Ok((head, fork_point)) => {
let prev = self.get_previous_header(&b.header)?;
let status = self.determine_status(
head,
Tip::from_header(&prev),
prev_head,
Tip::from_header(&fork_point),
);
let prev = self.get_previous_header(&b.header)?;
let status = self.determine_status(
head,
Tip::from_header(&prev),
prev_head,
Tip::from_header(&fork_point),
);
// notifying other parts of the system of the update
self.adapter.block_accepted(&b, status, opts);
// notifying other parts of the system of the update
self.adapter.block_accepted(&b, status, opts);
Ok(head)
}
Err(e) => match e.kind() {
ErrorKind::Unfit(ref msg) => {
debug!(
"Block {} at {} is unfit at this time: {}",
b.hash(),
b.header.height,
msg
);
Err(ErrorKind::Unfit(msg.clone()).into())
}
_ => {
info!(
"Rejected block {} at {}: {:?}",
b.hash(),
b.header.height,
e
);
Err(ErrorKind::Other(format!("{:?}", e)).into())
}
},
}
Ok(head)
}
/// Process a block header received during "header first" propagation.