A cohort's reserve is the whole of its reservoir, not a part of it

Commit proved the destination reservoir existed and that the registry slot was
free, but never that the reservoir was empty. Gathering into an occupied
reservoir therefore succeeded and mixed inventory the conversion had never
sampled into the cohort's backing store: the cohort's recorded reserve
understated what backed it, and the surplus belonged to nobody.

Reproduced against the unfixed code rather than taken on trust. Gathering into
reservoir 5, which the fixture already seeds with seven picojoules, commits and
leaves the ledger holding 67 against a cohort recording 60, exactly as reported.

A destination holding anything is refused now. The success test also asserts the
destination balance equals the installed cohort's reserve, so the equality is
checked rather than assumed, and the regression asserts the refusal leaves the
balances, the action counter and the registry as they were, then that emptying
the reservoir first makes the same plan committable.

The check runs after the staleness loop rather than beside the other destination
checks. Both run before anything moves, so it is a reporting choice: replaying a
committed plan into a fresh registry would be refused by either, and that the
members no longer hold what was sampled says more than that the reservoir is
occupied.

The guard was confirmed load-bearing by removing it alone. An earlier attempt at
that reported it as not load-bearing; that result was void and discarded, because
a heredoc had mangled the mutation script and nothing was ever mutated. Second
time this quirk has produced a false negative in a sweep, and both times the
printed output rather than the exit status is what caught it.

Release 35/35, analysis, ASan 35/35 and clang-format all ran and passed here.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
dingo
2026-09-24 09:59:39 -04:00
co-authored by Claude Opus 5
parent 1a59b63c7a
commit 0697895e25
7 changed files with 117 additions and 10 deletions
+36
View File
@@ -219,6 +219,9 @@ void a_committed_collapse_conserves_and_empties_the_members() {
CHECK(found.has_value());
CHECK(*found == plan.cohort());
CHECK(found->reserve() == plan.total());
// The cohort's recorded reserve is the whole of what backs it, not a part of
// it: nothing else shares the reservoir the conversion gathered into.
CHECK(ledger.balances()[destination.value - 1] == found->reserve());
CHECK(*installed == plan.cohort());
}
@@ -275,6 +278,38 @@ void every_rejection_leaves_the_world_as_it_was() {
CHECK(spare.size() == 0);
}
void a_destination_holding_anything_is_refused() {
// Gathering into an occupied reservoir would mix unrelated inventory into the
// cohort's backing store while the cohort recorded only what it sampled, so
// its reserve would understate what backs it and the surplus would be owned
// by nobody. Reservoir 5 already holds something in this fixture.
auto ledger = world();
CohortRegistry registry;
auto elsewhere = request();
elsewhere.destination = {5};
const auto offered = members();
const auto plan = plan_collapse(offered, elsewhere);
CHECK(plan.has_value());
CHECK(plan->total() == held(60, 600));
const auto opening = std::vector<Inventory>{ledger.balances().begin(), ledger.balances().end()};
const auto action = ledger.last_action();
CHECK(refused(commit_collapse(ledger, registry, *plan), CollapseError::destination_not_empty));
// Unfixed this committed, leaving the reservoir holding 67 energy against a
// cohort recording 60. Rejection must leave both sides exactly as they were.
CHECK(std::vector<Inventory>(ledger.balances().begin(), ledger.balances().end()) == opening);
CHECK(ledger.balances()[4] == held(7, 7));
CHECK(ledger.last_action() == action);
CHECK(registry.size() == 0);
// Emptying that reservoir first makes the same plan committable, and then the
// cohort's reserve is the whole of what backs it.
const std::array clear{Transfer{{5}, {4}, held(7, 7)}};
CHECK(ledger.transfer(ledger.last_action() + 1, clear).has_value());
const auto installed = commit_collapse(ledger, registry, *plan);
CHECK(installed.has_value());
CHECK(ledger.balances()[4] == plan->total());
CHECK(ledger.balances()[4] == installed->reserve());
}
void one_plan_cannot_be_committed_twice() {
auto ledger = world();
CohortRegistry registry;
@@ -332,6 +367,7 @@ int main() try {
an_ineligible_member_refuses_the_whole_plan();
a_committed_collapse_conserves_and_empties_the_members();
every_rejection_leaves_the_world_as_it_was();
a_destination_holding_anything_is_refused();
one_plan_cannot_be_committed_twice();
a_moved_from_plan_is_still_a_whole_plan();
std::cout << "PASS collapse sampling, exact conservation and unchanged-on-rejection\n";