diff --git a/src/v2/lens/enforcement/contract.dag b/src/v2/lens/enforcement/contract.dag index 45f0e5bfd57..b299639e5d1 100644 --- a/src/v2/lens/enforcement/contract.dag +++ b/src/v2/lens/enforcement/contract.dag @@ -56,7 +56,7 @@ import v2.lens.registry { } import v2.lens.enforcement.vocab { SubjectRoster, ScopeRoster, - EnforcementMode, Blocking, AuditOnly, Advisory, + EnforcementMode, Blocking, AuditOnly, ConsumerKind, EnrolledInFloorRoster, WitnessOnly, NoConsumer, ConsumerWitnessBinding, BoundConsumerWitness, NoConsumerWitness, ScopeSatisfaction, ScopeCovers, ScopeNarrowed, ScopeMissing, diff --git a/src/v2/lens/enforcement/gate.dag b/src/v2/lens/enforcement/gate.dag index e25dc456609..d01a0087522 100644 --- a/src/v2/lens/enforcement/gate.dag +++ b/src/v2/lens/enforcement/gate.dag @@ -7,7 +7,7 @@ import v2.std.algebra { for_all, any, filter, contains, non_empty, list_head, He import v2.lens.registry { LensRegistryEntryV0, LensIdV0, lens_id_v0_eq } import v2.lens.enforcement.vocab { SubjectRoster, - EnforcementMode, Advisory, AuditOnly, Blocking, enforcement_mode_satisfies, + EnforcementMode, AuditOnly, Blocking, enforcement_mode_satisfies, ConsumerKind, ConsumerRequirement, WitnessOnly, consumer_is_live, consumer_satisfies, ScopeSatisfaction, ScopeCovers, ScopeNarrowed, ScopeMissing, subject_roster_covers, @@ -140,7 +140,6 @@ fn scope_leg(intent: StandingIntent, s: ScopeSatisfaction) -> LegVerdict { match intent.default_mode { Blocking => LegFails { reason: "blocking intent narrowed by a reason not on the allow-list" } AuditOnly => LegHolds - Advisory => LegHolds } } } @@ -222,7 +221,6 @@ fn contract_internally_consistent(c: LensContract, receipts: List false } AuditOnly => true - Advisory => true } } diff --git a/src/v2/lens/enforcement/vocab.dag b/src/v2/lens/enforcement/vocab.dag index 468ee0cf049..65a22c4bfb8 100644 --- a/src/v2/lens/enforcement/vocab.dag +++ b/src/v2/lens/enforcement/vocab.dag @@ -12,7 +12,7 @@ type ScopeRoster { roots: List } -type EnforcementMode = Advisory | AuditOnly | Blocking +type EnforcementMode = AuditOnly | Blocking type ConsumerKind = EnrolledInFloorRoster | MergeAdmission | PrePushHook | PeriodicActuator @@ -48,7 +48,6 @@ type ReceiptRef = HasReceiptRef { ref: String } | NoReceiptRef fn mode_rank(m: EnforcementMode) -> Int { match m { - Advisory => 1 AuditOnly => 2 Blocking => 3 } diff --git a/src/v2/test/lens_enforcement/gate_test.dag b/src/v2/test/lens_enforcement/gate_test.dag index d52ffdbd732..3fd4071f583 100644 --- a/src/v2/test/lens_enforcement/gate_test.dag +++ b/src/v2/test/lens_enforcement/gate_test.dag @@ -5,6 +5,9 @@ import v2.lens.common.construction_justification { WallAfterGrounding } import std.disposition { SingleAuthority } +import v2.lens.enforcement.contract { EnrollmentDiscoveryReceipt, LensContract } +import v2.lens.enforcement.standing_intent { StandingIntent } +import v2.std.live_tree { LiveTreeDisposition } data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree @@ -204,6 +207,4 @@ test fn consumer_requirement_discriminates() -> Bool { test fn enforcement_mode_order_discriminates() -> Bool { return !enforcement_mode_satisfies(actual: AuditOnly, required: v2.lens.enforcement.vocab.Blocking) && enforcement_mode_satisfies(actual: v2.lens.enforcement.vocab.Blocking, required: AuditOnly) - && !enforcement_mode_satisfies(actual: Advisory, required: AuditOnly) - && enforcement_mode_satisfies(actual: AuditOnly, required: Advisory) } diff --git a/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag b/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag index cfce9b90e91..d7cc0d59c24 100644 --- a/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag +++ b/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag @@ -2097,37 +2097,37 @@ data unimported_bare_provider_dispositions: List