Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@crates/p2p/src/gossip_client.rs`:
- Around line 1468-1614: Add unit tests for the new retry helpers: write tests
that call pull_data_from_peer_with_retry,
pull_primitive_data_from_peer_with_retry and indirectly exercise
handle_peer_pull_response; cover (1) immediate success returning Ok, (2) first
attempt returning RejectionReason::HandshakeRequired which triggers
peer_list.initiate_handshake and then succeeds on retry, and (3) both attempts
failing to produce an Err. Use mocks/stubs for GossipClient internals (simulate
pull_data_and_update_the_score / pull_primitive_data_and_update_the_score
returning GossipResponse::Accepted(Some(_)),
GossipResponse::Rejected(HandshakeRequired(...)) then Accepted, and persistent
errors) and assert the returned PeerNetworkError or (IrysPeerId, mapped) values
and that peer_list.initiate_handshake and set_is_online_by_peer_id are invoked
where applicable.
- Around line 1468-1545: Both functions contain the same retry loop; extract
that loop into a single helper (e.g., pull_with_handshake_retry) that accepts
the common parameters (data_request: GossipDataRequestV2, peer: &(IrysPeerId,
PeerListItem), peer_list: &PeerList) plus an async fetch closure/factory which
returns the same Result type used today; inside the helper run the for attempt
in 0..2 loop, call the provided fetch closure to get the Result, then call
Self::handle_peer_pull_response(...) exactly as currently done and return
PeerPullOutcome results; then replace pull_data_from_peer_with_retry to call the
new helper with a closure that invokes self.pull_data_and_update_the_score(...,
fallback_header, ...) and replace pull_primitive_data_from_peer_with_retry to
call it with a closure that invokes
self.pull_primitive_data_and_update_the_score(...), keeping the existing mapping
and error message behavior.

---

Outside diff comments:
In `@crates/p2p/src/gossip_client.rs`:
- Around line 1409-1425: pull_transaction_from_peer currently calls
pull_primitive_data_from_peer_with_retry which ends up in
pull_primitive_data_and_update_the_score without calling check_circuit_breaker,
allowing requests to peers with open circuit breakers; add a pre-request
circuit-breaker check by invoking self.check_circuit_breaker(&peer.0)?; at the
start of pull_primitive_data_and_update_the_score (or, if you prefer a narrower
change, add the same call inside pull_transaction_from_peer immediately before
calling pull_primitive_data_from_peer_with_retry) so circuit state is honored
while still preserving the retry/recursion behavior handled by
pull_primitive_data_from_peer_with_retry and handle_data_retrieval_score.

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@crates/p2p/src/gossip_client.rs`:
- Around line 49-54: The enum PeerPullOutcome<T> is missing a Debug impl; add
#[derive(Debug)] above the enum declaration for PeerPullOutcome<T> so the
compiler generates a Debug implementation (which will introduce the required T:
Debug bound where used) to improve test diagnostics and logging, then update any
tests that currently use std::mem::discriminant to instead rely on the enum's
Debug output if desired.
- Around line 1486-1507: The final Err(...) after the for loop is unreachable
because the loop over attempt in 0..2 will always return on the second iteration
(handle_peer_pull_response only yields RetryAfterHandshake when attempt == 0);
replace the Err(PeerNetworkError::FailedToRequestData(...)) tail with
unreachable!() to document the invariant and cause a panic if future changes
violate it. Update the code in the function containing the for attempt in 0..2
loop that calls Self::handle_peer_pull_response and use unreachable!()
(optionally with a brief message) instead of returning the PeerNetworkError to
make the unreachable control-flow explicit.
- Around line 1571-1581: The outer warn! that logs all rejections is redundant
for the RejectionReason::HandshakeRequired branch because a more specific warn!
follows; update the handling in the match so that either (a) the outer log is
demoted to debug! before matching RejectionReason, or (b) skip logging in the
outer path when the reason is RejectionReason::HandshakeRequired and let the
inner warn! (inside the RejectionReason::HandshakeRequired arm) be the only log;
locate the outer warn! and the match on RejectionReason::HandshakeRequired in
gossip_client.rs and adjust the logging accordingly (references:
RejectionReason::HandshakeRequired, peer_list.initiate_handshake, the outer
warn! that logs "Peer {:?} rejected {:?} request: {:?}").
- Around line 3075-3137: The two tests calling pull_with_handshake_retry
(handshake_required_then_success_on_retry and
handshake_required_both_attempts_returns_err) trigger a real sleep on
HANDSHAKE_WAIT_TIMEOUT; update both test annotations to
#[tokio::test(start_paused = true)] so the tokio clock is paused and timers
auto-advance (removing the ~1s wait per test) while keeping the same async
behavior and assertions against pull_with_handshake_retry and its handshake
retry logic.
- Around line 1570-1606: The match currently consumes reason (RejectionReason)
inside the GossipResponse::Rejected arm which relies on RejectionReason being
Copy; change the match to match &reason { ... } and update each pattern to match
references (e.g., RejectionReason::HandshakeRequired(_) ->
RejectionReason::HandshakeRequired(inner) becomes
RejectionReason::HandshakeRequired(inner) with an ampersand) so the variable
reason remains usable for the later warn! and the
PeerPullOutcome::Err(PeerNetworkError::FailedToRequestData(...)) format call;
ensure the initiate_handshake call on peer_list.initiate_handshake(...) and
other arms (GossipDisabled, InvalidCredentials, ProtocolMismatch) use reference
patterns accordingly so no ownership is moved.

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@crates/p2p/src/gossip_client.rs`:
- Around line 1568-1604: The inner match arm for GossipResponse::Rejected
currently shadows the outer variable named reason when matching
RejectionReason::HandshakeRequired; rename the inner binding to handshake_reason
(or similar) in the RejectionReason::HandshakeRequired arm where you call
peer_list.initiate_handshake and log the handshake wait so the outer
RejectionReason remains unshadowed for the final PeerPullOutcome::Err call that
uses reason in the format! message; update any references inside that arm (e.g.,
the warn! call and any uses of the inner Option) to use handshake_reason
instead.

---

Duplicate comments:
In `@crates/p2p/src/gossip_client.rs`:
- Around line 2896-2899: The match's panic uses std::mem::discriminant
unnecessarily; since PeerPullOutcome now implements Debug, change the panic arm
to print the variant directly (e.g., panic!("expected Ok, got {:?}", other)) so
the full enum variant/value is shown; update the match handling that binds
outcome (PeerPullOutcome::Ok((id, _block)) => ...) to use the Debug-printable
`other` in the panic.