Skip to content

Commit

Permalink
chore: add lints to p2p-sync
Browse files Browse the repository at this point in the history
Add workspace lints, which in particular ban `as` usage.

Changes:
1. switch `as` into `From` when applicable.
2. replace the conditional+cast with _equivalent_ logic `u64::try_from`.
  • Loading branch information
Gilad Chase committed Nov 7, 2024
1 parent 322d984 commit f9922df
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
3 changes: 3 additions & 0 deletions crates/papyrus_p2p_sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ tokio = { workspace = true, features = ["test-util"] }
# The `metrics` crate is used by `latency_histogram` proc macro, which is used in this crate.
[package.metadata.cargo-machete]
ignored = ["metrics"]

[lints]
workspace = true
16 changes: 7 additions & 9 deletions crates/papyrus_p2p_sync/src/server/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ pub(crate) fn calculate_block_number(
Direction::Backward => -1,
};
// TODO(shahak): Fix this code.
let blocks_delta: i128 = direction_factor * (query.step * read_blocks_counter) as i128;
let block_number: i128 = start_block as i128 + blocks_delta;
if block_number < 0 || block_number > u64::MAX as i128 {
return Err(P2PSyncServerError::BlockNumberOutOfRange {
query: query.clone(),
counter: read_blocks_counter,
});
}
Ok(block_number as u64)
let blocks_delta: i128 = direction_factor * i128::from(query.step * read_blocks_counter);
let block_number: i128 = i128::from(start_block) + blocks_delta;

u64::try_from(block_number).map_err(|_| P2PSyncServerError::BlockNumberOutOfRange {
query: query.clone(),
counter: read_blocks_counter,
})
}

0 comments on commit f9922df

Please sign in to comment.