GameCult/Ghostlight
Watch
9
0
Fork
You've already forked Ghostlight
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Name the library's test subject human, not player

Browse source 
Players are a Dungeon concept. The library's own term for a
human-controlled subject is ControllerMode::Human, so its test code now
says so: the principal fixture player() becomes human_principal() (a
local `human` subject binding in action.rs would shadow a bare human()),
and the genesis subject handle, labels, principal address, variables and
one test name follow:

- "player" handle -> "human"; "The Player" -> "The Human";
  "Another Player" -> "Another Human";
  "player@example.test" -> "human@example.test"
- player_opportunity, after_player, genesis_player ->
  human_opportunity, after_human, genesis_human
- draft_activation_player_and_autonomous_actions_share_one_reducer ->
  draft_activation_human_and_autonomous_actions_share_one_reducer

Test code only: no production code, schema string, serde name, pinned
digest or fixture file carried any of these values. The library test
count stays 419 passed and 1 ignored.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-09-16 12:19:04 +02:00
commit ab95d7897c
4 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ghostlight/src/action.rs
View file

@ -1025,7 +1025,7 @@ mod tests {
ADMIT_KIND, COMMAND_KIND, Civic, LEVY_KIND, OPENING_BALANCE, SEIZURE_GRIEVANCE, Topology,
WARDEN_OFFICE, activate, affordance_named, auth_principal, authority_kind, civic_world,
command, custody_world, grant_to, grievance, office, operations, opportunity_for,
over_place, over_subject, player, reject_owner, submit_owner,
over_place, over_subject, human_principal, reject_owner, submit_owner,
};
use crate::{
AffordanceKindName, AuthenticatedCaller, AuthoredSource, CallerId, CommandBody, Confidence,
@ -1732,7 +1732,7 @@ mod tests {
command(
&active,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ExerciseDecision {
opportunity: opportunity_for(&active, human),
invocation: DecisionInvocation {
@ -1744,7 +1744,7 @@ mod tests {
},
},
),
&auth_principal(player()),
&auth_principal(human_principal()),
)
.expect("the Speak entry commits");
assert!(matches!(receipt, SubmitReceipt::Applied(_)));

2
crates/ghostlight/src/consumer.rs
View file

@ -965,7 +965,7 @@ mod tests {
submit_through(&mailbox, owner(), CommandBody::ApproveDraft).await;
submit_through(
&mailbox,
crate::tests::player(),
crate::tests::human_principal(),
CommandBody::ApproveDraft,
)
.await;

78
crates/ghostlight/src/lib.rs
View file

@ -4933,8 +4933,8 @@ mod tests {
PrincipalId::new("owner@example.test")
}
pub(crate) fn player() -> PrincipalId {
PrincipalId::new("player@example.test")
pub(crate) fn human_principal() -> PrincipalId {
PrincipalId::new("human@example.test")
}
pub(crate) fn auth_principal(principal: PrincipalId) -> AuthenticatedCaller {
@ -5030,11 +5030,11 @@ mod tests {
carries_speech: true,
}),
subject(
"player",
"The Player",
"human",
"The Human",
SubjectKind::Person,
NewController::Human {
principal: player(),
principal: human_principal(),
},
),
subject(
@ -5102,10 +5102,10 @@ mod tests {
command(
&after_owner,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ApproveDraft,
),
&auth_principal(player()),
&auth_principal(human_principal()),
)
.unwrap();
let approved = kernel.snapshot().unwrap();
@ -6543,7 +6543,7 @@ mod tests {
}
#[test]
fn draft_activation_player_and_autonomous_actions_share_one_reducer() {
fn draft_activation_human_and_autonomous_actions_share_one_reducer() {
let dir = tempfile::tempdir().unwrap();
let path = dir.path().join("world.cc");
let (mut kernel, _) = WorldKernel::create(
@ -6561,34 +6561,34 @@ mod tests {
assert_eq!(active.phase, WorldPhase::Active);
assert_eq!(active.opportunities.len(), 3);
let player_opportunity = opportunity(&active, ControllerMode::Human);
let human_opportunity = opportunity(&active, ControllerMode::Human);
kernel
.submit(
command(
&active,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ExerciseDecision {
invocation: speak(&player_opportunity, "I open the door."),
opportunity: player_opportunity,
invocation: speak(&human_opportunity, "I open the door."),
opportunity: human_opportunity,
},
),
&auth_principal(player()),
&auth_principal(human_principal()),
)
.unwrap();
let after_player = kernel.snapshot().unwrap();
let after_human = kernel.snapshot().unwrap();
assert_eq!(kernel.state.events.len(), 1);
assert_eq!(
spoken(&kernel.state, &kernel.state.events[0]),
Some("I open the door.")
);
let persona_opportunity = opportunity(&after_player, ControllerMode::NarrativePersona);
let persona_opportunity = opportunity(&after_human, ControllerMode::NarrativePersona);
let persona_caller = CallerId::Controller(persona_opportunity.controller_id);
kernel
.submit(
command(
&after_player,
&after_human,
CommandId::new(),
persona_caller.clone(),
CommandBody::ExerciseDecision {
@ -6641,10 +6641,10 @@ mod tests {
command(
&owner_approved,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ActivateWorld,
),
&auth_principal(player())
&auth_principal(human_principal())
),
Err(KernelError::Unauthorized)
));
@ -6667,10 +6667,10 @@ mod tests {
command(
&owner_approved,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ApproveDraft,
),
&auth_principal(player()),
&auth_principal(human_principal()),
)
.unwrap();
let approved = kernel.snapshot().unwrap();
@ -6683,13 +6683,13 @@ mod tests {
command(
&active,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ExerciseDecision {
invocation: speak(&persona, "Puppet"),
opportunity: persona,
},
),
&auth_principal(player())
&auth_principal(human_principal())
),
Err(KernelError::ControllerMismatch)
));
@ -6724,13 +6724,13 @@ mod tests {
command(
&active,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ExerciseDecision {
invocation: denied_invocation,
opportunity: original.clone(),
},
),
&auth_principal(player())
&auth_principal(human_principal())
),
Err(KernelError::AffordanceDenied)
));
@ -6744,7 +6744,7 @@ mod tests {
command(
&active,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ExerciseDecision {
invocation: DecisionInvocation {
affordance: forged_affordance,
@ -6756,7 +6756,7 @@ mod tests {
opportunity: tampered,
},
),
&auth_principal(player())
&auth_principal(human_principal())
),
Err(KernelError::AffordanceDenied)
));
@ -6769,13 +6769,13 @@ mod tests {
command(
&active,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ExerciseDecision {
invocation: speak(&original, "No"),
opportunity: forged_scope,
},
),
&auth_principal(player())
&auth_principal(human_principal())
),
Err(KernelError::ScopeChanged { .. })
));
@ -6792,13 +6792,13 @@ mod tests {
command(
&active,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ExerciseDecision {
invocation: speak(&original, "No"),
opportunity: unknown_scope,
},
),
&auth_principal(player())
&auth_principal(human_principal())
),
Err(KernelError::OpportunityMismatch)
));
@ -7066,10 +7066,10 @@ mod tests {
command(
&second_snapshot,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ApproveDraft,
),
&auth_principal(player()),
&auth_principal(human_principal()),
)
.unwrap();
let after_second = kernel.snapshot().unwrap();
@ -7131,7 +7131,7 @@ mod tests {
assert_eq!(
rejected,
vec![Mismatch::DuplicateHandle {
handle: DraftHandle::new("player")
handle: DraftHandle::new("human")
}]
);
assert!(
@ -7286,7 +7286,7 @@ mod tests {
let forged = command(
&snapshot,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CommandBody::ApproveDraft,
);
assert!(matches!(
@ -12268,7 +12268,7 @@ mod clock_tests {
use super::patch::{PreconditionRef, PressureSourceRef, WorldScaleIntentRef};
use super::tests::{
activate, affordance_named, auth_principal, command, creation, operations, opportunity_for,
owner, player, reject_owner, submit_owner,
owner, human_principal, reject_owner, submit_owner,
};
use super::*;
use std::path::Path;
@ -12922,7 +12922,7 @@ mod clock_tests {
assert!(TickMinutes::new(super::patch::MAX_ROUTE_COST + 1).is_none());
for caller in [
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
CallerId::Controller(active.opportunities[0].controller_id),
] {
let error = kernel
@ -13692,7 +13692,7 @@ mod clock_tests {
targets: BTreeMap::from([(SubjectKind::Person, 10)]),
jurisdictions: BTreeMap::from([
(DraftHandle::new(super::tests::COMMONS), 700),
(DraftHandle::new("player"), 400),
(DraftHandle::new("human"), 400),
]),
};
let Err(error) = WorldKernel::create(
@ -13706,9 +13706,9 @@ mod clock_tests {
panic!("expected a rejected genesis patch");
};
assert!(mismatches.contains(&Mismatch::ScaleWeightsExceedWhole));
// `player` is a subject handle, not a place.
// `human` is a subject handle, not a place.
assert!(mismatches.contains(&Mismatch::UnknownJurisdictionRoot {
handle: DraftHandle::new("player"),
handle: DraftHandle::new("human"),
}));
// Half the whole distributes half the target, rounded down.

24
crates/ghostlight/src/patch.rs
View file

@ -7295,7 +7295,7 @@ mod tests {
use super::*;
use crate::tests::{
FIXTURE_ENTITIES, activate, admit_topology, auth_principal, command, creation, owner,
player, reject_owner, speak_entry, submit_owner,
human_principal, reject_owner, speak_entry, submit_owner,
};
use crate::{
CallerId, CommandBody, CommandId, KernelError, SubmitReceipt, WorldKernel, WorldPhase,
@ -7910,7 +7910,7 @@ mod tests {
label: "A Late Arrival".into(),
kind: SubjectKind::Person,
controller: NewController::Human {
principal: player(),
principal: human_principal(),
},
affordances: BTreeSet::from([speak_entry(&kernel)]),
position: None,
@ -8352,14 +8352,14 @@ mod tests {
command(
&before,
CommandId::new(),
CallerId::Principal(player()),
CallerId::Principal(human_principal()),
admit(patch_of(vec![entity(
"rhythm-road",
"The Rhythm Road",
EntityKind::Place,
)])),
),
&auth_principal(player()),
&auth_principal(human_principal()),
)
.unwrap_err();
assert!(matches!(error, KernelError::Unauthorized));
@ -8415,16 +8415,16 @@ mod tests {
let directory = tempfile::tempdir().unwrap();
let mut kernel = draft_world(directory.path());
let before = kernel.snapshot().unwrap();
let genesis_player = before
let genesis_human = before
.subjects
.iter()
.find(|subject| subject.label == "The Player")
.expect("the genesis player subject")
.find(|subject| subject.label == "The Human")
.expect("the genesis human subject")
.id;
let patch = patch_of(vec![Declaration::Subject(SubjectDeclaration {
handle: DraftHandle::new("player"),
label: "Another Player".into(),
handle: DraftHandle::new("human"),
label: "Another Human".into(),
kind: SubjectKind::Person,
controller: NewController::NarrativePersona,
affordances: BTreeSet::from([speak_entry(&kernel)]),
@ -8435,10 +8435,10 @@ mod tests {
.state
.subjects
.iter()
.find(|(_, subject)| subject.label == "Another Player")
.find(|(_, subject)| subject.label == "Another Human")
.expect("the admitted subject")
.0;
assert_ne!(admitted, genesis_player);
assert_ne!(admitted, genesis_human);
let command_id = CommandId::new();
let first = resolve_patch(&kernel.state, command_id, &patch, None).unwrap();
@ -8634,7 +8634,7 @@ mod tests {
let unauthorized = super::super::apply_effect(
&mut candidate,
CommandId::issue(),
&CallerId::Principal(player()),
&CallerId::Principal(human_principal()),
&honest,
)
.unwrap_err();