diff --git a/internal/buckets/buckets.go b/internal/buckets/buckets.go index 878f4a9..00214c2 100644 --- a/internal/buckets/buckets.go +++ b/internal/buckets/buckets.go @@ -3,6 +3,12 @@ // reads through grants composed in code, so the holder's name is kept here, in its own code (ADR 0634 §1, finding F4). package buckets +import ( + assigner "git.novox.be/novox/mesh-contracts/placement/go/clients/meshmoduleassignerclient" + seat "git.novox.be/novox/mesh-contracts/placement/go/seats/meshmoduleassigner" + wants "git.novox.be/novox/mesh-contracts/placement/go/seats/meshwants" +) + // The node-engine's own states and the have state, written by every node's engine for its own keys. const ( // Have holds a module's have on a node, `.`, and the node's own facts, `.node`. @@ -20,9 +26,9 @@ const HaveHistory = 20 // module as every state is (ADR 0634 §1, finding F4: the holder's name is kept here, in the engine's code). const ( // Placement holds a node's placement, `.node`, and each of its modules, `.`. - Placement = "mesh-delivery-assigner_placement" + Placement = assigner.PlacementBucket // PlacementCandidates holds a node's candidate of a proposal, `.`. - PlacementCandidates = "mesh-delivery-assigner_candidates" + PlacementCandidates = assigner.Module + "_" + seat.StateCandidates // Wants holds what each node should run, `want..` and `want..node`. - Wants = "mesh-delivery-assigner_wants" + Wants = assigner.Module + "_" + wants.StateWants ) diff --git a/internal/compose/frombus/states.go b/internal/compose/frombus/states.go index 4c5dcab..2c5d38b 100644 --- a/internal/compose/frombus/states.go +++ b/internal/compose/frombus/states.go @@ -28,7 +28,7 @@ import ( const ( // The holders' names are kept here, in the engine's own code, as the names of the states a manifest's reads use // (ADR 0634 §1, finding F4); a seat's contract names a state locally, not the module that holds it. - PlacementRead = "mesh-delivery-assigner.placement" + PlacementRead = meshmoduleassignerclient.PlacementRead ModulesRead = "mesh-delivery-indexer.modules" ManifestsRead = "mesh-delivery-indexer.manifests" BuildsRead = "mesh-delivery-builder.builds"