Aetherlight AL2a.1: delete the lens lane and the Ghostlight golden fixture
Remove lens.rs, LensWeights in genesis input, WorldState, snapshot and creation, SetLensWeights, LensWeightsReplaced, LensWeightsNeverDraw and the draw-rule shape check. The journal's lens replay tests are rewritten over an owner AdvanceTime history (replays exactly; a forged caller fails replay). The state shape changed, so Ghostlight's base_world fixture no longer decodes: the golden replay test and its three fixtures go (AL4 adds Aetherlight's own). Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
6ef5f51a42
commit
10f487dc16
10 changed files with 50 additions and 939 deletions
|
|
@ -14,7 +14,7 @@
|
|||
use super::clock::{FictionalMinutes, TickMinutes};
|
||||
use super::grammar::GrammarRefusal;
|
||||
use super::{
|
||||
AffordanceId, CommandId, ControllerAssignment, ControllerId, EdgeId, EntityId, LensWeights,
|
||||
AffordanceId, CommandId, ControllerAssignment, ControllerId, EdgeId, EntityId,
|
||||
NewController, SubjectId, SubjectKind, SubjectState, WorldId,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
@ -1737,9 +1737,6 @@ pub enum Mismatch {
|
|||
/// The permille weights sum over 1000: weights distribute the target and
|
||||
/// never raise it.
|
||||
ScaleWeightsExceedWhole,
|
||||
/// A lens weight set with no nonzero weight, at genesis or in
|
||||
/// `SetLensWeights`. A single zero weight is admitted and never draws.
|
||||
LensWeightsNeverDraw,
|
||||
/// A jurisdictional author wrote outside its jurisdiction. The owner is
|
||||
/// unconfined and never sees this.
|
||||
OutsideJurisdiction {
|
||||
|
|
@ -2141,9 +2138,6 @@ pub(super) struct ResolvedPatch {
|
|||
/// carries no intent, so the write-once rule is the command shape rather
|
||||
/// than a check.
|
||||
pub(super) scale_intent: Option<WorldScaleIntent>,
|
||||
/// `Some` on the genesis lane and nowhere else, as `scale_intent` is. After
|
||||
/// genesis the weights change only through `SetLensWeights`.
|
||||
pub(super) lens_weights: Option<LensWeights>,
|
||||
}
|
||||
|
||||
impl ResolvedPatch {
|
||||
|
|
@ -3219,7 +3213,6 @@ pub(super) fn resolve_patch(
|
|||
command_id: CommandId,
|
||||
patch: &WorldPatch,
|
||||
scale_intent: Option<&WorldScaleIntentRef>,
|
||||
lens_weights: Option<&LensWeights>,
|
||||
) -> Result<ResolvedPatch, Vec<Mismatch>> {
|
||||
let world_id = state.world_id;
|
||||
let admits_human = super::admits_human(state.revision, &state.subjects);
|
||||
|
|
@ -5151,12 +5144,6 @@ pub(super) fn resolve_patch(
|
|||
}
|
||||
}
|
||||
|
||||
if let Some(weights) = lens_weights
|
||||
&& !weights.draws()
|
||||
{
|
||||
mismatches.push(Mismatch::LensWeightsNeverDraw);
|
||||
}
|
||||
|
||||
if patch.declarations.is_empty() && patch.operations.is_empty() {
|
||||
mismatches.push(Mismatch::NoCanonicalChange);
|
||||
}
|
||||
|
|
@ -5854,7 +5841,6 @@ pub(super) fn resolve_patch(
|
|||
})
|
||||
.collect(),
|
||||
}),
|
||||
lens_weights: lens_weights.cloned(),
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -7378,8 +7364,8 @@ mod tests {
|
|||
assert_ne!(admitted, genesis_human);
|
||||
|
||||
let command_id = CommandId::new();
|
||||
let first = resolve_patch(&kernel.state, command_id, &patch, None, None).unwrap();
|
||||
let second = resolve_patch(&kernel.state, command_id, &patch, None, None).unwrap();
|
||||
let first = resolve_patch(&kernel.state, command_id, &patch, None).unwrap();
|
||||
let second = resolve_patch(&kernel.state, command_id, &patch, None).unwrap();
|
||||
assert_eq!(first, second);
|
||||
}
|
||||
|
||||
|
|
@ -7522,7 +7508,7 @@ mod tests {
|
|||
Some(Ref::Draft(DraftHandle::new("rhythm-road"))),
|
||||
),
|
||||
]);
|
||||
let resolved = resolve_patch(&kernel.state, CommandId::new(), &patch, None, None).unwrap();
|
||||
let resolved = resolve_patch(&kernel.state, CommandId::new(), &patch, None).unwrap();
|
||||
let honest = super::super::WorldEffect::PatchAdmitted {
|
||||
resolved: resolved.clone(),
|
||||
answers: None,
|
||||
|
|
@ -7726,7 +7712,6 @@ mod tests {
|
|||
for edge_id in [topology.span, topology.shutter, topology.toll] {
|
||||
let forged = super::super::WorldEffect::PatchAdmitted {
|
||||
resolved: ResolvedPatch {
|
||||
lens_weights: None,
|
||||
subjects: Vec::new(),
|
||||
entities: Vec::new(),
|
||||
routes: Vec::new(),
|
||||
|
|
|
|||
Loading…
Reference in a new issue