fix(clique): err types #59
Conversation
|
After this I think only the |
niklasad1
force-pushed
the
clique-errors
branch
from
5d8c7dd to
98218fe
Compare
| @@ -405,8 +404,12 @@ impl Engine<EthereumMachine> for Clique { | |||
| let mut seal: Vec<u8> = Vec::with_capacity(VANITY_LENGTH + SIGNATURE_LENGTH); | |||
|
|
|||
| // At this point, extra_data should only contain miner vanity. | |||
| if header.extra_data().len() > VANITY_LENGTH { | |||
| panic!("on_seal_block: unexpected extra_data: {:?}", header); | |||
| if header.extra_data().len() != VANITY_LENGTH { | |||
There was a problem hiding this comment.
This is more accurate because VANITY_DATA should be 32 bytes but it may be out-of-scope for this PR
| } | ||
| } | ||
| } | ||
| if header.extra_data().len() < VANITY_LENGTH + SIGNATURE_LENGTH { |
There was a problem hiding this comment.
only style cleanup to reduce the indentation level but it will fetch the state before trying to read the signer.
Also might be out-of-scope for this PR
There was a problem hiding this comment.
There doesn't seem to be any issue with this that I can identify off the top of my head.
There was a problem hiding this comment.
Actually.. this adds a bit of extra overhead that we don't need. Can we move state query after the signer is read?
| } | ||
| } | ||
| } else { | ||
| trace!(target: "engine", "populate_from_parent: no signer registered"); |
There was a problem hiding this comment.
new trace might be annoying if no signer is enabled!
Can revert it
| assert!(tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'A').is_err()); | ||
| let err = tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'A').unwrap_err(); | ||
|
|
||
| match err.kind() { |
There was a problem hiding this comment.
ugly workaround because error_chain::ErrorKind doesn't implement PartialEq AFAIU
|
@jwasinger sorry, I wasn't aware org members only have read access, you should be able to review now |
| "just pushed to front, reference must exist; qed" | ||
| )?.parent_hash()); | ||
| let last_checkpoint_hash = *chain.front() | ||
| .expect("chain has at least one element; qed") |
There was a problem hiding this comment.
Jk.. this just looks terrible in github. Looks fine on my editor locally.
Fixes grumble #54 (comment)