[SharovBot] chore: weekly code cleanup consolidation (erigontech#21811)

**[SharovBot]** 🧹 Weekly Code Cleanup — June 15th, 2026

This PR consolidates the following small cleanup changes that were
individually submitted as PRs this week:

| Original PR | Description |
|------------|-------------|
| erigontech#21587 | refactor: use the built-in max to simplify the code |

Changes that could not be applied due to conflicts:
- erigontech#21346: patch does not apply (file context drift in
`node/components/storage/snapshot/inventory.go`)
- erigontech#21588: patch does not apply (file context drift in
`cmd/utils/flags.go`)
- erigontech#21589: patch does not apply
(`p2p/sentry/sentry_multi_client/bal_downloader.go` not found — likely
moved or renamed)

---
*Automated weekly consolidation by SharovBot.*

Co-authored-by: erigon-copilot[bot] <erigon-copilot[bot]@users.noreply.github.com>
Co-authored-by: Giulio Rebuffo <giulio.rebuffo@gmail.com>

Author: erigon-copilot[bot]

cl/phase1/execution_client/block_collector/persistent_block_collector.go

@@ -312,10 +312,7 @@ func (p *PersistentBlockCollector) Flush(ctx context.Context) error {
 		// Use a non-cancelable context: if ctx was cancelled the caller cares
 		// about stopping, but skipping cleanup would leave already-inserted
 		// rows in place and the next Flush would re-read and re-insert them.
-		cutoff := minInsertableBlockNumber
-		if lastCommittedHeight+1 > cutoff {
-			cutoff = lastCommittedHeight + 1
-		}
+		cutoff := max(lastCommittedHeight+1, minInsertableBlockNumber)
 		if err := p.db.Update(context.Background(), func(tx kv.RwTx) error {
 			cursor, err := tx.RwCursor(kv.Headers)
 			if err != nil {

cl/phase1/network/beacon_downloader.go

@@ -213,10 +213,7 @@ func (f *ForwardBeaconDownloader) RequestMore(ctx context.Context) {
 							}
 						}
 
-						backoff := baseInterval * time.Duration(1<<uint(min(failures, 4)))
-						if backoff > 5*time.Second {
-							backoff = 5 * time.Second
-						}
+						backoff := min(baseInterval*time.Duration(1<<uint(min(failures, 4))), 5*time.Second)
 						reqInterval.Reset(backoff)
 						return
 					}

cl/sentinel/handlers/blocks_by_head.go

@@ -31,10 +31,7 @@ func (c *ConsensusHandlers) beaconBlocksByHeadHandler(s network.Stream) error {
 		return err
 	}
 
-	count := req.Count
-	if count > c.beaconConfig.MaxRequestBlocksDeneb {
-		count = c.beaconConfig.MaxRequestBlocksDeneb
-	}
+	count := min(req.Count, c.beaconConfig.MaxRequestBlocksDeneb)
 	if count == 0 {
 		return nil
 	}