Repository navigation
Delete E3-root: request-path forwarders, dead LaneMap, duplicate test fixtures - #1671
Merged
Merged
Conversation
… fixtures Collapse the journal_settlement forwarding chain onto journal_settlement_kind, share one line-terminate helper in serve_lines, delete the dead LaneMap, gate two test-only methods to cfg(test), fold adjust::refused onto error_answer_with_message, and collapse duplicated test fixtures and helpers onto the one surviving implementation.
…our test A drift planted (test builds only) where check_label_banks reads its pairs must make registry::seal refuse with BootRefusal::LabelDrift naming both spellings. Dropping the check from the seal makes the seal answer Ok and the test fail.
This was referenced Oct 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Executes delete batch E3-root (busbar root crate, request path first). Re-verified against dev 8accfe3. No behaviour change.
Deleted (20 of 23)
Hot path:
crates/busbar/src/root/durability/mod.rs: thejournal_settlement→_as→_counted→_refusingforwarder chain (4 fns, ~50 lines).settle,settle_posted,settle_counted_refusingand boot hold recovery now calljournal_settlement_kinddirectly. That removes three call frames per settlement.crates/busbar/src/root/serve_lines.rs: the line-terminate logic was duplicated inLineCaller::writeand the carrier sink closure. Both now use oneterminated(bytes), which allocates once with capacitylen+1, so a push never reallocates.Off the hot path:
root/adapters.rs: deadLaneMap(46 lines) and its 3 self-tests.root/doors.rs:Dispatched::refreshis now#[cfg(test)]. Its only caller is a test, and the stale doc link is dropped. It is gated rather than deleted because that caller,tests/doors_refresh.rs, is in C7 (loader): the conformance suite and test doubles move to busbar-test-kit #1660.root/keyset.rs:bind_ephemeralis now#[cfg(test)].root/tests/adapters.rs: the boot-seal test's source-text half (aninclude_str!grep ofregistry.rsforcheck_label_banks()insideseal) is replaced by a behaviour test that guards the same bug, item 248: the label-bank check existed but the boot seal never ran it. The new test isthe_boot_seal_refuses_a_planted_label_drift. A test-onlythread_local(PLANTED_PAIR,#[cfg(test)], so no production effect) adds one drifted pair to whatcheck_label_bankscompares. The test then requiresregistry::sealto refuse withBootRefusal::LabelDrift { breaker: "transient_upstream", egress: "transient-upstream" }. The existing behavioural test (a_label_drift_refuses_the_boot_and_todays_banks_seal) is unchanged.check_label_banks()call removed fromseal):FAIL root::adapters::tests::the_boot_seal_refuses_a_planted_label_drift, panicking with "the boot seal sealed over a label drift: it does not run the check". In the same run, the kept testa_label_drift_refuses_the_boot_and_todays_banks_sealPASSED, which shows it does not catch the bug by itself.cargo clippy -p busbar --all-targets -D warningspasses with default features and with--no-default-features, andcargo fmt --checkis clean.root/tests/admin_plugin_admission.rs: 12 inline temp-dir blocks now calltmp_plugins_dir(tag).root/tests/durability_amend.rs: 3 inline scratch dirs now use the sharedScratch.root/tests/durability_boot_reads.rsanddurability_reads_unlocked.rs: their twoaudit_inputscopies are gone. Both files now usedurability_audit::inputs.root/tests/keyset.rs: theDirRAII copy is gone; it uses the sharedScratch.Scratch(fromdurability_audit.rs) is re-exported undercfg(test)fromdurability.root/tests/linked_secret_sources.rs: deleted the duplicate..._genuinely_unset_still_reports_unset. Merged..._missing_path_still_reports_cannot_resolveinto..._missing_file_is_an_error, keeping its "not regular file" assertion.root/tests/plane_node_money.rs:history_ofnow delegates tofee_history_of, andrerank_reporttorerank_report_on. 5 copied memory-book and node setups now useswept_node().root/units_admin/adjust.rs:refusedis gone; its callers useerror_answer_with_message(400, "invalid_request", …). That function'sroot-admingate is lifted becauseadjustis ungated.root/units_admin/tests/admin_path_without_plane_face.rs:mounted_over(inner, cap, door, rows, tweak).over,over_asandover_with_keynow share onesend(...).THE_UNBOUND_VERBSconst is gone. The generic check now asserts the unbound set is empty.Skipped (3)
root/transports.rsPlaneDispatchtrait andDrivenOnce(2 items, hot path): removing them requires editingroot/plane_node.rs, which open PRs kernel: delete proxy/mod.rs; the door shapes its own dialect refusal (status row 82) #1372 and D2: drain plane_driver/serve.rs::TABLES — the generation carries its admin table (stacked on #1482) #1485 change. Do after those land.units_admin/tests/admin_path_without_plane_face.rsshared operator-fixture module (ADirectoryThatMintedItand others): sharing it needsunits_admin/tests/units_admin.rs, which C5: delete the legacy dual paths; keep the 1.5.5 migrate and read-back paths #1658, C13 + C10: TODO/transitional markers out of the code; delete dead qa/field-inventory.json #1650 and Step 5: core depends on no plugin; in-tree llm plane deleted; dist/default is the distribution #1659 change. Do after Step 5: core depends on no plugin; in-tree llm plane deleted; dist/default is the distribution #1659.Verification
cargo build,cargo check --workspace --all-targetsandcargo clippy -p busbar --all-targets -D warningspass, with default features and with--no-default-features.cargo nextest run -p busbar: 1702 run, 1702 passed, 4 skipped.production LOC (loc-tool): 251675 → 251599 (busbar crate 28525 → 28449)