mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-06 03:28:24 +00:00
Johnathan Corgan
e7bc577e30
Carries the fipsctl probe diagnostic up: one commit, which reports where a target sits in the spanning tree relative to this node and whether the node can reach it, as five stages advanced on the daemon's tick behind three control commands. It changes no wire format on either line. Two conflicts, and the first is the one worth reading. `src/instr/recorder.rs` pins the number of instrumentation steps a tick emits, and the pin exists to catch exactly this merge. Master went from 25 unconditional steps to 26 by adding `poll_probes`; this branch was already at 26, its own being `resend_pending_fmp_rekey_msg3`. Both lines therefore held `expected = 27` for different reasons, so git merged that literal without a conflict and only the comment above it collided. The merged tick emits 27 unconditional steps, so the literal is now 28 and the comment records why the two lines agreed on a wrong number. `src/node/tests/session.rs` conflicted because master extracted `populate_all_coord_caches` into `src/node/tests/spanning_tree.rs` as `pub(super)` and deleted the two local copies, while this branch still held both. The sibling copy in `forwarding.rs` merged that way on its own; this one is resolved to match, deleting the local definition and taking the shared one, with the import list a union so this branch's profile helpers survive. The deletion stops there: `mesh_state`, which sits in the same region of the file and has no counterpart on the master line, stays. It is this branch's own helper and three tests here call it.