Fix rebase conflicts

2026-03-06 10:11:44 +00:00 · 2023-01-26 20:18:59 +01:00
parent 69c30bb6eb
commit 09370e70d9
21 changed files with 196 additions and 128 deletions
--- a/beacon_node/network/src/sync/range_sync/chain.rs
+++ b/beacon_node/network/src/sync/range_sync/chain.rs
@@ -615,6 +615,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
    ///
    /// If a previous batch has been validated and it had been re-processed, penalize the original
    /// peer.
+    #[allow(clippy::modulo_one)]
    fn advance_chain(&mut self, network: &mut SyncNetworkContext<T>, validating_epoch: Epoch) {
        // make sure this epoch produces an advancement
        if validating_epoch <= self.start_epoch {