An empty reservoir is not an unowned one
Two defects from review of380d609. Materialization treated an empty reservoir as available. A vacant cohort, or one holding nothing, still owns its store, so a draw could credit it while the owning record went on recording nothing: the same inventory in two places, reached from the opposite direction to the destination defect in1a59b63. Destinations are checked against the registry's ownership now, not just their balance, and the registry answers whether a reservoir is used rather than callers inferring it from what the reservoir contains. The same hole existed on the collapse side in a worse form, found by asking whether the reported defect had a sibling. Nothing verified the destination was unowned, so the shared-reservoir rule added in M4.3 would have refused the install only after the transfer had run, leaving the members emptied and their biomass in a reservoir nothing accounted for. That is exactly the stranding the M4.2 ordering was chosen to prevent, defeated by a check that ran too late. Whichever registry step follows a transfer is now proved to succeed before it, through may_install and may_replace queries that install and replace delegate to, so there is one rule and not a restatement that can drift. The second finding was a functional gap the oscillation test hid by discarding its registry each cycle. A full draw leaves a vacant record, which ADR-0036 retains because absence is not extinction, and collapse then refused that habitat and genome as occupied: a full materialization was a one-way door out of a habitat and the lineage could never return. Collapse repopulates a vacant record in place now, continuing its ownership and revision series rather than restarting them, and a record still holding a population is refused, because merging two silently is not a conversion. The test keeps one registry for all twelve cycles and asserts the revision continues. Four of the five new guards are load-bearing. The fifth is not and is recorded as such: the may_replace pre-check in commit_materialize is unreachable given the checks before it, since the installed record is already proved equal to the plan's origin and the result differs only by a later revision. It is kept because it is the right place for the guard and its collapse-side sibling is genuinely reachable, not because it is exercised. Release 37/37, analysis, ASan 37/37 and clang-format all ran and passed here. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -310,6 +310,37 @@ void a_destination_holding_anything_is_refused() {
|
||||
CHECK(ledger.balances()[4] == installed->reserve());
|
||||
}
|
||||
|
||||
void a_destination_owned_by_another_cohort_is_refused() {
|
||||
// An empty reservoir is not an available one. A cohort holding nothing still
|
||||
// owns its store, and gathering into it would put inventory there that its own
|
||||
// record does not account for. Worse, the shared-reservoir rule would have
|
||||
// refused the install only after the transfer, leaving the members emptied and
|
||||
// their biomass in a reservoir nothing accounts for.
|
||||
auto ledger = world();
|
||||
CohortRegistry registry;
|
||||
CohortDraft squatter;
|
||||
squatter.representation_version = cohort_representation_version;
|
||||
squatter.habitat = {7};
|
||||
squatter.genome = 99; // A different lineage, so not the habitat/genome guard.
|
||||
squatter.owner = {11, 2};
|
||||
squatter.last_tick = evo::Tick{900};
|
||||
squatter.revision = 1;
|
||||
squatter.conversion = 1;
|
||||
squatter.reservoir = destination; // The reservoir this collapse would gather into.
|
||||
squatter.classes = {{0, 100, 1, Inventory{}, 0}};
|
||||
const auto sitting = Cohort::create(squatter);
|
||||
CHECK(sitting.has_value());
|
||||
CHECK(registry.install(*sitting).has_value());
|
||||
const auto plan = planned();
|
||||
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_owned));
|
||||
CHECK(std::vector<Inventory>(ledger.balances().begin(), ledger.balances().end()) == opening);
|
||||
CHECK(ledger.last_action() == action);
|
||||
CHECK(registry.size() == 1);
|
||||
CHECK(registry.find(HabitatId{7}, 99)->reserve() == Inventory{});
|
||||
}
|
||||
|
||||
void one_plan_cannot_be_committed_twice() {
|
||||
auto ledger = world();
|
||||
CohortRegistry registry;
|
||||
@@ -368,6 +399,7 @@ int main() try {
|
||||
a_committed_collapse_conserves_and_empties_the_members();
|
||||
every_rejection_leaves_the_world_as_it_was();
|
||||
a_destination_holding_anything_is_refused();
|
||||
a_destination_owned_by_another_cohort_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";
|
||||
|
||||
Reference in New Issue
Block a user