diff --git a/modules/mesh-delivery-indexer/takein/takein.go b/modules/mesh-delivery-indexer/takein/takein.go index 351635cf..e95a2973 100644 --- a/modules/mesh-delivery-indexer/takein/takein.go +++ b/modules/mesh-delivery-indexer/takein/takein.go @@ -232,56 +232,3 @@ func DecodeTakeIn(data []byte) (TakeIn, error) { // SameTakeIn says whether two take-in bodies are the same value. func SameTakeIn(a, b TakeIn) bool { return reflect.DeepEqual(a, b) } - -// PendingWait is one wait the indexer's tool indexer_pending answers (novox/hq ADR 0633 §5), as the view reads it to -// name a module waiting for its revision's indexer. Key and What are a take-in event's: a revision under its oldest -// merge's key, waiting for the indexer build WaitsFor (empty while it is worked out), or a group being gathered under -// its group key, with Members every approved member and Merges those held so far. A revision that waits behind a -// group being gathered names that group's key in Behind. Keys are the pending keys of its merges, in Merges' order (indexer_drop_pending drops one). Holds are the modules it holds back: every module of its -// merges' trees. Said is the last take-in event said of it (`take-in.`, of its Key) and SaidAt when. -type PendingWait struct { - Key string `json:"key"` - What string `json:"what"` - Merges []Merge `json:"merges"` - Keys []string `json:"keys"` - Group string `json:"group,omitempty"` - Members []meshdeliveryclient.Head `json:"members,omitempty"` - Behind string `json:"behind,omitempty"` - WaitsFor string `json:"waits-for,omitempty"` - Since time.Time `json:"since"` - Holds []string `json:"holds"` - Said string `json:"said,omitempty"` - SaidAt time.Time `json:"said-at,omitzero"` - // Lost are the keys of its merges whose message the forge bridge's stream no longer holds (TakeIn.Lost). - Lost []string `json:"lost,omitempty"` - // Unread are the keys of its merges whose message is unread for a transport fault: read again on the next message - // heard on the forge, at the start and by indexer_take_in_pending, never dropped for it (issue 1966, ADR 0668 §1). - Unread []string `json:"unread,omitempty"` - // Refused is why the manifest of the indexer it names was refused (TakeIn.Refused). - Refused string `json:"refused,omitempty"` -} - -// PendingAnswer is indexer_pending's answer: every wait, oldest first, and the pending keys that do not read. -type PendingAnswer struct { - Waits []PendingWait `json:"waits"` - Unread []string `json:"unread,omitempty"` - OwnBuildSince time.Time `json:"own-build-since,omitzero"` - // OwnBuild is the build the running indexer knows it runs, fixed at its start; OwnBuildSince is since when. Empty when unknown: - // it names only the writer of what the indexer writes, and nothing waits for it. - OwnBuild string `json:"own-build,omitempty"` -} - -// DecodePendingAnswer reads indexer_pending's answer, refusing a wait that is not a revision or a group, or names no -// key. -func DecodePendingAnswer(data []byte) (PendingAnswer, error) { - var a PendingAnswer - if err := json.Unmarshal(data, &a); err != nil { - return a, fmt.Errorf("delivery: not an answer of indexer_pending: %w", err) - } - for _, w := range a.Waits { - if w.Key == "" || (w.What != TakeInRevision && w.What != TakeInGroup) { - return a, fmt.Errorf("delivery: indexer_pending answers a wait %q of %q, not a revision or a group", w.Key, w.What) - } - } - return a, nil -} diff --git a/modules/mesh-delivery-indexer/takein/takein_test.go b/modules/mesh-delivery-indexer/takein/takein_test.go index 67029fd2..b446b8d8 100644 --- a/modules/mesh-delivery-indexer/takein/takein_test.go +++ b/modules/mesh-delivery-indexer/takein/takein_test.go @@ -1,9 +1,7 @@ package takein import ( - "encoding/json" "errors" - "reflect" "strings" "testing" "time" @@ -91,15 +89,4 @@ func TestTakeInEvents(t *testing.T) { t.Errorf("a lost hold is refused: %v", err) } } - // indexer_pending's answer reads back; a wait of neither kind is refused. - pa := PendingAnswer{Waits: []PendingWait{{Key: PendingKey(12), What: TakeInRevision, Merges: sampleTakeIns(since)[0].Merges, - Keys: []string{PendingKey(12)}, WaitsFor: "src2:abc", Since: since, Holds: []string{"mesh-delivery-indexer"}, Said: "take-in.pending." + PendingKey(12), SaidAt: since}}} - if data, err := json.Marshal(pa); err != nil { - t.Fatal(err) - } else if got, err := DecodePendingAnswer(data); err != nil || !reflect.DeepEqual(got, pa) { - t.Errorf("pending answer round trip: %+v %v", got, err) - } - if _, err := DecodePendingAnswer([]byte(`{"waits":[{"key":"m.1","what":"held"}]}`)); err == nil { - t.Error("a pending answer with a wait of neither kind accepted") - } }