Add clippy fixes and minor refactoring (#6450)

This commit is contained in:
Thomas Coratger
2024-02-06 23:11:22 +01:00
committed by GitHub
parent 189d76735e
commit 37a8780a4d
8 changed files with 38 additions and 55 deletions

View File

@ -121,13 +121,12 @@ impl ForkchoiceStatus {
/// Converts the general purpose [PayloadStatusEnum] into a [ForkchoiceStatus].
pub(crate) fn from_payload_status(status: &PayloadStatusEnum) -> Self {
match status {
PayloadStatusEnum::Valid => ForkchoiceStatus::Valid,
PayloadStatusEnum::Invalid { .. } => ForkchoiceStatus::Invalid,
PayloadStatusEnum::Syncing => ForkchoiceStatus::Syncing,
PayloadStatusEnum::Accepted => {
// This is only returned on `newPayload` accepted would be a valid state here.
PayloadStatusEnum::Valid | PayloadStatusEnum::Accepted => {
// `Accepted` is only returned on `newPayload`. It would be a valid state here.
ForkchoiceStatus::Valid
}
PayloadStatusEnum::Invalid { .. } => ForkchoiceStatus::Invalid,
PayloadStatusEnum::Syncing => ForkchoiceStatus::Syncing,
}
}
}
@ -169,8 +168,8 @@ impl ForkchoiceStateHash {
impl AsRef<B256> for ForkchoiceStateHash {
fn as_ref(&self) -> &B256 {
match self {
ForkchoiceStateHash::Head(h) => h,
ForkchoiceStateHash::Safe(h) => h,
ForkchoiceStateHash::Head(h) |
ForkchoiceStateHash::Safe(h) |
ForkchoiceStateHash::Finalized(h) => h,
}
}