Fix rebase conflicts

This commit is contained in:
Emilia Hane
2023-01-26 20:18:59 +01:00
parent 69c30bb6eb
commit 09370e70d9
21 changed files with 196 additions and 128 deletions

View File

@@ -409,14 +409,14 @@ impl ProtocolId {
/// beginning of the stream, else returns `false`.
pub fn has_context_bytes(&self) -> bool {
match self.version {
Version::V2 => match self.message_name {
Protocol::BlocksByRange | Protocol::BlocksByRoot => return true,
_ => return false,
},
Version::V1 => match self.message_name {
Protocol::BlobsByRange | Protocol::BlobsByRoot => return true,
_ => return false,
},
Version::V2 => matches!(
self.message_name,
Protocol::BlobsByRange | Protocol::BlobsByRoot
),
Version::V1 => matches!(
self.message_name,
Protocol::BlobsByRange | Protocol::BlobsByRoot
),
}
}
}