jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

add match_same_arms clippy lint (#8549)

Browse Source
This commit is contained in:
Thomas Coratger
2024-06-03 19:42:25 +02:00
committed by GitHub
parent 0f1bad98f2
commit e02b935e94
34 changed files with 259 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/net/downloaders/src/headers/reverse_headers.rs
View File

@ -378,7 +378,7 @@ where
let target = headers.remove(0).seal_slow();
match sync_target {
SyncTargetBlock::Hash(hash) => {
SyncTargetBlock::Hash(hash) | SyncTargetBlock::HashAndNumber { hash, .. } => {
if target.hash() != hash {
return Err(HeadersResponseError {
request,
@ -403,18 +403,6 @@ where
.into())
}
}
SyncTargetBlock::HashAndNumber { hash, .. } => {
if target.hash() != hash {
return Err(HeadersResponseError {
request,
peer_id: Some(peer_id),
error: DownloadError::InvalidTip(
GotExpected { got: target.hash(), expected: hash }.into(),
),
}
.into())
}
}
}
trace!(target: "downloaders::headers", head=?self.local_block_number(), hash=?target.hash(), number=%target.number, "Received sync target");
@ -1014,17 +1002,19 @@ impl SyncTargetBlock {
const fn with_hash(self, hash: B256) -> Self {
match self {
Self::Hash(_) => Self::Hash(hash),
Self::Number(number) => Self::HashAndNumber { hash, number },
Self::HashAndNumber { number, .. } => Self::HashAndNumber { hash, number },
Self::Number(number) | Self::HashAndNumber { number, .. } => {
Self::HashAndNumber { hash, number }
}
}
}
/// Set a number on the instance.
const fn with_number(self, number: u64) -> Self {
match self {
Self::Hash(hash) => Self::HashAndNumber { hash, number },
Self::Hash(hash) | Self::HashAndNumber { hash, .. } => {
Self::HashAndNumber { hash, number }
}
Self::Number(_) => Self::Number(number),
Self::HashAndNumber { hash, .. } => Self::HashAndNumber { hash, number },
}
}
@ -1054,9 +1044,8 @@ impl SyncTargetBlock {
/// Return the hash of the target block, if it is set.
const fn hash(&self) -> Option<B256> {
match self {
Self::Hash(hash) => Some(*hash),
Self::Hash(hash) | Self::HashAndNumber { hash, .. } => Some(*hash),
Self::Number(_) => None,
Self::HashAndNumber { hash, .. } => Some(*hash),
}
}
@ -1064,8 +1053,7 @@ impl SyncTargetBlock {
const fn number(&self) -> Option<u64> {
match self {
Self::Hash(_) => None,
Self::Number(number) => Some(*number),
Self::HashAndNumber { number, .. } => Some(*number),
Self::Number(number) | Self::HashAndNumber { number, .. } => Some(*number),
}
}
}