diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go b/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go index 1fed33ab..17b2c293 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go @@ -27,7 +27,7 @@ import ( func serve(t *testing.T) string { t.Helper() - m := view.New(viewstate.ViewModule) + m := view.New(testView) placed, err := meshmoduleassignerclient.AssignmentsValues(meshmoduleassigner.Assignments{Node: "a", Modules: []meshmoduleassigner.PlacedModule{{Module: "x"}}}) if err != nil { t.Fatal(err) @@ -82,7 +82,7 @@ func TestFailsLoudWhenTheViewIsNotThere(t *testing.T) { // 1134/AC6 } func TestPrintsTheCandidateGroupsAndTheFingerprintComparison(t *testing.T) { // 1241/AC6 - m := view.New(viewstate.ViewModule) + m := view.New(testView) const head = "0123456789abcdef0123456789abcdef01234567" cand, err := json.Marshal(meshcatalog.CandidatesByGroupValue{Group: "feat/x", Pulls: []meshcatalog.CandidatesByGroupValuePullsItem{{Repository: "novox/mesh-delivery", Number: 12, Head: head, Modules: []string{"a"}}}, Heads: mustHash(t, meshdeliveryclient.Head{Repository: "novox/mesh-delivery", Number: 12, Head: head})}) @@ -130,7 +130,7 @@ func mustHash(t *testing.T, h meshdeliveryclient.Head) string { // TestPrintsTheOpenAsksInTheTableAndTheJSON: the command shows what waits for the operator's Approve (1345/AC2). The ask is // the gate's, as mesh-sdk go/delivery EncodeAsk writes it under the key MergeAskKey gives (as internal/view asks_test.go). func TestPrintsTheOpenAsksInTheTableAndTheJSON(t *testing.T) { // 1345/AC2 - m := view.New(viewstate.ViewModule) + m := view.New(testView) key, err := asks.HoldAskKey("plex", "src2:2222222222222222222222222222222222222222222222222222222222222222") if err != nil { t.Fatal(err) @@ -221,7 +221,7 @@ func TestTheAnswerCommandAnswersAnAskNeedingNoProof(t *testing.T) { // 1297/B9b if err != nil { t.Fatal(err) } - m, w := view.New(viewstate.ViewModule), &putter{puts: map[string][]byte{}} + m, w := view.New(testView), &putter{puts: map[string][]byte{}} m.SetWriter(w) m.Apply(view.Entry{Bucket: view.AsksBucket, Key: key, Value: value}) socket := serveWith(t, m) @@ -264,7 +264,7 @@ func TestTheHoldCommandsListAndAnswerHolds(t *testing.T) { hkey, _ := meshwantsclient.HeldKey("systemd-resolved", fp) held, _ := meshwantsclient.EncodeHeld(meshwantsclient.Held{Node: "ace", Words: "health failed, phase running: dns timeout"}) ans, _ := meshdeliveryclient.EncodeAnswer(meshdeliveryclient.Answer{Option: "keep", Warrant: hold.ID + "@2026-10-25T04:00:00Z", Words: "the operator chose keep"}) - m, w := view.New(viewstate.ViewModule), &putter{puts: map[string][]byte{}} + m, w := view.New(testView), &putter{puts: map[string][]byte{}} m.SetWriter(w) m.Apply(view.Entry{Bucket: view.AsksBucket, Key: key, Value: value}) m.Apply(view.Entry{Bucket: view.WantsBucket, Key: hkey, Value: held}) @@ -302,3 +302,5 @@ func rawAsk(t *testing.T, a oc.Ask) json.RawMessage { } return b } + +const testView = "acme-view" diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go index d7492fd1..b3138c12 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go @@ -476,7 +476,7 @@ func main() { logf := func(f string, a ...any) { fmt.Fprintf(os.Stderr, "[mesh-delivery-view-tools] "+f+"\n", a...) } // The catalog half per watched branch, followed by the bundle itself through meshcatalogclient's branch follower on // its own views reader (design 47 G §532, §614, A-103), as other bundles follow the views they read. - cat := &views.Reader{Module: viewstate.ViewModule, Logf: logf, Acts: meshhandactsclient.Recorder{Ask: stdio.Ask}} + cat := &views.Reader{Module: os.Getenv(stdio.ServedAs), Logf: logf, Acts: meshhandactsclient.Recorder{Ask: stdio.Ask}} branches, err := meshcatalogclient.FollowBranches(cat, stdio.Ask) if err != nil { logf("%v", err) @@ -515,8 +515,8 @@ func main() { // view_first_views and view_first_view_again: where the view's process stands with its first views of the indexer's and // the assigner's states (ADR 0615 §6), and a re-read by hand. tools := append(Tools(r, u), gate.Tools()...) - tools = append(tools, AnswersTool(views.ParseCallers(os.Getenv(views.CallersEnv(viewstate.ViewAnswersTool))), func(name string) views.Source { return views.KeptSource{State: stdio.State(name)} }, time.Now)) - tools = append(tools, views.StatusTools(viewstate.ViewModule, "view_first_views", "view_first_view_again", stdio.State(views.StatusState), meshhandactsclient.Recorder{Ask: stdio.Ask}, time.Now)...) + tools = append(tools, AnswersTool(os.Getenv(stdio.ServedAs), views.ParseCallers(os.Getenv(views.CallersEnv(viewstate.ViewAnswersTool))), func(name string) views.Source { return views.KeptSource{State: stdio.State(name)} }, time.Now)) + tools = append(tools, views.StatusTools(os.Getenv(stdio.ServedAs), "view_first_views", "view_first_view_again", stdio.State(views.StatusState), meshhandactsclient.Recorder{Ask: stdio.Ask}, time.Now)...) if err := stdio.Serve("", tools); err != nil { fmt.Fprintf(os.Stderr, "[mesh-delivery-view-tools] %v\n", err) os.Exit(1) @@ -526,8 +526,8 @@ func main() { // AnswersTool is answers, the first-view tool of the seat mesh-delivery-view's state answers (mesh-sdk views.FirstViewTool), // answered to the callers its list names (the teller): its first view of the answers the view says on views.answers // (design 47 G A-175, A-178, §717, A-301). -func AnswersTool(callers stdio.Callers, state func(string) views.Source, now func() time.Time) stdio.Tool { - return views.FirstViewTool(viewstate.ViewModule, viewstate.ViewAnswersTool, viewstate.ViewAnswersState, +func AnswersTool(module string, callers stdio.Callers, state func(string) views.Source, now func() time.Time) stdio.Tool { + return views.FirstViewTool(module, viewstate.ViewAnswersTool, viewstate.ViewAnswersState, "the operator's answers given in the view to the asks of the seat mesh-wants, one key .view each, which the teller fills the ask from.", callers, state(viewstate.ViewAnswersState), state(views.MarksState), now) } diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go index 34e7efcc..acdd693b 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go @@ -281,14 +281,14 @@ const manifestDigestA = "0123456789abcdef0123456789abcdef0123456789abcdef0123456 // key, answered to the teller its callers list names and refused to any other caller. func TestTheViewReadsItsAnswersAsAnOwner(t *testing.T) { answers := source{"hold.plex.ab.view": `{"asking":"a1","option":"release"}`} - tool := AnswersTool(views.ParseCallers("mesh-delivery-teller"), func(name string) views.Source { + tool := AnswersTool("acme-view", views.ParseCallers("mesh-delivery-teller"), func(name string) views.Source { if name == viewstate.ViewAnswersState { return answers } return source{} }, time.Now) - if tool.Name != "answers" { - t.Fatalf("the tool is %s", tool.Name) + if tool.Name != "answers" || !strings.Contains(tool.Description, "acme-view") { + t.Fatalf("the tool is %s: %s", tool.Name, tool.Description) } // Answered only to the callers its list names: the teller, never a call no runtime proved. if !strings.Contains(tool.Description, "mesh-delivery-teller") { diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go index 360c49ac..4ab8a135 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go @@ -42,17 +42,20 @@ import ( // serveOwners serves the six states of the indexer and the assigner the view's process follows by their first views // (ADR 0615 §1, DLV-M4): each owner's read tool and views family, with the view's durable consumer (`n_mesh-delivery-view`). // A bucket the test made is kept; the others are made empty. +// testView is the module the bed's credential names; the view names its buckets and events from it (A-296). +const testView = "mesh-delivery-view" + func serveOwners(t *testing.T, ctx context.Context, js jetstream.JetStream, nc *nats.Conn) { t.Helper() for _, o := range ownersFollowed { - viewstest.Serve(t, ctx, js, nc, o.owner, o.state, o.tool, "n_"+viewstate.ViewModule) + viewstest.Serve(t, ctx, js, nc, o.owner, o.state, o.tool, "n_"+testView) } // Design 47 G §717, A-303: the seats' views at their holders, which the seat-holders view of the catalog half's claimant // names (serveCatalog's claimant): stand-ins named for their seats, so each real bucket is the picture's seat-form name. for _, o := range []struct{ holder, state string }{{claimantModule, view.AssignmentsState}, {"mesh-wants", "wants"}, {"mesh-wants", "asks"}} { - viewstest.Serve(t, ctx, js, nc, o.holder, o.state, o.holder+"."+o.state, "n_"+viewstate.ViewModule) + viewstest.Serve(t, ctx, js, nc, o.holder, o.state, o.holder+"."+o.state, "n_"+testView) } - holders := viewstest.Serve(t, ctx, js, nc, claimantModule, "seat-holders", claimantModule+".seat-holders", "n_"+viewstate.ViewModule) + holders := viewstest.Serve(t, ctx, js, nc, claimantModule, "seat-holders", claimantModule+".seat-holders", "n_"+testView) for seat, holder := range map[string]string{"mesh-module-assigner": claimantModule, "mesh-wants": "mesh-wants"} { if _, err := holders.Put(ctx, seat, []byte(`{"seat":"`+seat+`","holders":[{"module":"`+holder+`","node":"n"}]}`)); err != nil { t.Fatal(err) @@ -581,12 +584,12 @@ func TestProcessWholeWritesTheAnswerToAnAskNeedingNoProof(t *testing.T) { // 129 return kv } askBucket := bucket(view.AsksBucket, view.AssignerAsksHistory) - viewBucket := bucket(viewstate.BucketsOf(viewstate.ViewModule).Answers, viewstate.ViewAnswersHistory) - bucket(viewstate.ViewModule+"_"+views.MarksState, 1) + viewBucket := bucket(viewstate.BucketsOf(testView).Answers, viewstate.ViewAnswersHistory) + bucket(testView+"_"+views.MarksState, 1) teller := bucket(view.AnswersBucket, view.AnswersHistory) // The view says its answers on its views family (design 47 G A-178), which the teller follows. said := make(chan *nats.Msg, 8) - sub, err := nc.ChanSubscribe("mesh.mod."+viewstate.ViewModule+".event."+views.EventPrefix+viewstate.ViewAnswersState, said) + sub, err := nc.ChanSubscribe("mesh.mod."+testView+".event."+views.EventPrefix+viewstate.ViewAnswersState, said) if err != nil { t.Fatal(err) } @@ -805,7 +808,7 @@ func TestProcessWholeSaysTheSourceRevisionIsDelivered(t *testing.T) { t.Fatal(err) } kvs := map[string]jetstream.KeyValue{} - for _, name := range []string{view.WantsBucket, view.HaveBucket, viewstate.BucketsOf(viewstate.ViewModule).Reach} { + for _, name := range []string{view.WantsBucket, view.HaveBucket, viewstate.BucketsOf(testView).Reach} { kv, err := js.CreateKeyValue(ctx, jetstream.KeyValueConfig{Bucket: name, History: 5}) if err != nil { t.Fatal(err) @@ -877,7 +880,7 @@ func TestProcessWholeSaysTheSourceRevisionIsDelivered(t *testing.T) { if err := json.Unmarshal(rm.Data, &re); err != nil || re.Key != "novox/web" { t.Fatalf("the event reached = %s, %v", rm.Data, err) } - if stored, gerr := kvs[viewstate.BucketsOf(viewstate.ViewModule).Reach].Get(ctx, re.Key); gerr != nil || string(stored.Value()) != string(re.Reach) { + if stored, gerr := kvs[viewstate.BucketsOf(testView).Reach].Get(ctx, re.Key); gerr != nil || string(stored.Value()) != string(re.Reach) { t.Errorf("the event carries %s, the state reach holds %v (%v)", re.Reach, stored, gerr) } } diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go index 301cc780..abe6cacc 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go @@ -135,7 +135,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro // started once, after both (design 47 G §512, A-242). hub := process.NewEventHub(logger.Printf) defer hub.Stop() - reader := &views.ProcessReader{Module: viewstate.ViewModule, Call: calls.Call, Logf: logger.Printf, Hub: hub} + reader := &views.ProcessReader{Module: cred.Module, Call: calls.Call, Logf: logger.Printf, Hub: hub} // The view's finding stream is its `finding-events` entry, asked of the seat mesh-broker's show (design 47 G A-274, // §529, §577): the writer says its events under that binding's subjects. binding := process.NewBinding(meshbroker.Seat, cred.Module, calls.CallKept, logger.Printf, views.FindingEventsLocal) @@ -223,7 +223,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro func sayAnswers(ctx context.Context, js jetstream.JetStream, nc process.Subscriber, cred process.Account, writer views.WireWriter, errs chan<- error, logf func(string, ...any)) { marks := cred.Module + "_" + views.MarksState process.AwaitBucket(ctx, js, nc, marks, "the view's answers are not said on its views family, so the teller waits on its first view", logf).Ready(func(mk jetstream.KeyValue) { - em := views.Emitter{Owner: viewstate.ViewModule, Subject: cred.EventSubject, Publish: views.JetStreamPublish(js), Marks: mk, Findings: writer, Logf: logf} + em := views.Emitter{Owner: cred.Module, Subject: cred.EventSubject, Publish: views.JetStreamPublish(js), Marks: mk, Findings: writer, Logf: logf} process.AwaitBucket(ctx, js, nc, viewstate.BucketsOf(cred.Module).Answers, "the view's answers are not said on its views family", logf).Ready(func(kv jetstream.KeyValue) { if err := em.Start(ctx, viewstate.ViewAnswersState, kv, errs); err != nil { logf("%v: the teller asks the first-view tool answers at each change until the view starts again", err) diff --git a/modules/mesh-delivery-view/internal/view/answers_test.go b/modules/mesh-delivery-view/internal/view/answers_test.go index ad5606f6..00eff0c9 100644 --- a/modules/mesh-delivery-view/internal/view/answers_test.go +++ b/modules/mesh-delivery-view/internal/view/answers_test.go @@ -64,7 +64,7 @@ func holdAsk(t *testing.T) (Entry, oc.Ask) { } func TestAnAskNeedingNoProofIsOpenInTheViewWithItsOptions(t *testing.T) { // 1297/B9 - m := New(viewstate.ViewModule) + m := New(testView) e, a := holdAsk(t) fill(m, e) got := m.Snapshot().Asks @@ -79,7 +79,7 @@ func TestAnAskNeedingNoProofIsOpenInTheViewWithItsOptions(t *testing.T) { // 129 } func TestTheViewWritesItsAnswerUnderTheAsksViewKey(t *testing.T) { // 1297/B9a AC - m, w := New(viewstate.ViewModule), &memWriter{} + m, w := New(testView), &memWriter{} m.SetWriter(w) e, _ := holdAsk(t) fill(m, e) @@ -99,7 +99,7 @@ func TestTheViewWritesItsAnswerUnderTheAsksViewKey(t *testing.T) { // 1297/B9a A t.Errorf("parse = %q, %v", back, err) } // The view hears its own answer back from its bucket and shows the ask as answered, waiting for the teller. - fill(m, Entry{Bucket: viewstate.BucketsOf(viewstate.ViewModule).Answers, Key: e.Key + ".view", Value: raw, At: t0}) + fill(m, Entry{Bucket: viewstate.BucketsOf(testView).Answers, Key: e.Key + ".view", Value: raw, At: t0}) got := m.Snapshot().Asks if len(got) != 1 || got[0].Chosen != "release" { t.Errorf("asks = %+v, want the ask with chosen release", got) @@ -132,7 +132,7 @@ func TestTheViewRefusesWhatItMayNotAnswer(t *testing.T) { // 1297/B9a AC {"no option", e.Key, " ", "no option", []Entry{e}}, } for _, c := range cases { - m, w := New(viewstate.ViewModule), &memWriter{} + m, w := New(testView), &memWriter{} m.SetWriter(w) fill(m, c.prep...) err := m.Answer(c.key, c.option, "") @@ -143,7 +143,7 @@ func TestTheViewRefusesWhatItMayNotAnswer(t *testing.T) { // 1297/B9a AC t.Errorf("%s: wrote %v", c.name, w.puts) } } - m := New(viewstate.ViewModule) + m := New(testView) e2, _ := holdAsk(t) fill(m, e2) if err := m.Answer(e2.Key, "release", ""); err == nil || !strings.Contains(err.Error(), "cannot write") { @@ -201,7 +201,7 @@ func postAnswer(h http.Handler, form url.Values, mod func(*http.Request)) *httpt } func TestThePageAnswersAnAskAndRefusesAForeignPost(t *testing.T) { // 1297/B9a - m, w := New(viewstate.ViewModule), &memWriter{} + m, w := New(testView), &memWriter{} m.SetWriter(w) e, _ := holdAsk(t) fill(m, e) @@ -245,14 +245,14 @@ func TestThePageAnswersAnAskAndRefusesAForeignPost(t *testing.T) { // 1297/B9a } func TestAStaleViewAnswerOfAnotherAskingIsNotTheChoice(t *testing.T) { // 1297/B9 (stale answer) - m := New(viewstate.ViewModule) + m := New(testView) e, a := holdAsk(t) fill(m, e) stale, err := viewstate.EncodeViewAnswer(viewstate.ViewAnswer{Asking: "an-earlier-asking", Option: "release"}) if err != nil { t.Fatal(err) } - fill(m, Entry{Bucket: viewstate.BucketsOf(viewstate.ViewModule).Answers, Key: e.Key + ".view", Value: stale, At: t0}) + fill(m, Entry{Bucket: viewstate.BucketsOf(testView).Answers, Key: e.Key + ".view", Value: stale, At: t0}) if got := m.Snapshot().Asks; len(got) != 1 || got[0].Chosen != "" { t.Errorf("a stale answer shows as the choice: %+v", got) } diff --git a/modules/mesh-delivery-view/internal/view/asks_test.go b/modules/mesh-delivery-view/internal/view/asks_test.go index ddea4f03..faca02d0 100644 --- a/modules/mesh-delivery-view/internal/view/asks_test.go +++ b/modules/mesh-delivery-view/internal/view/asks_test.go @@ -11,7 +11,6 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) // answerEntry is the teller's answer to the first asking of the key; answerToAsking to the asking with this router id. The @@ -30,7 +29,7 @@ func answerToAsking(t *testing.T, key, id string) Entry { } func TestAnAskWithNoAnswerIsListedAndAnAnsweredOneIsNot(t *testing.T) { // 1345/AC1 - m := New(viewstate.ViewModule) + m := New(testView) e, a := holdAsk(t) fill(m, e) s := m.Snapshot() @@ -55,7 +54,7 @@ func TestAnAskWithNoAnswerIsListedAndAnAnsweredOneIsNot(t *testing.T) { // 1345/ // The gate's asks go with the Approve per merge (design 47 G §431, §512): a value under the gate's former state is no ask // of the view's, and nothing names it unreadable. func TestTheGatesMergeAsksAreNoAsksOfTheView(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) fill(m, Entry{Bucket: "mesh-delivery-gate_asks", Key: "merge.g.0123456789ab", Value: []byte(`{"v":1,"group":"g"}`), At: t0}, Entry{Bucket: "mesh-delivery-gate_asks", Key: "merge.h.0123456789ab", Value: []byte("{"), At: t0}) if s := m.Snapshot(); len(s.Asks) != 0 || len(s.Unreadable) != 0 { @@ -64,7 +63,7 @@ func TestTheGatesMergeAsksAreNoAsksOfTheView(t *testing.T) { } func TestAnAnswerHeardBeforeItsAskStillHidesTheAsk(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) e, _ := holdAsk(t) fill(m, answerEntry(t, e.Key), e) if got := m.Snapshot().Asks; len(got) != 0 { @@ -73,7 +72,7 @@ func TestAnAnswerHeardBeforeItsAskStillHidesTheAsk(t *testing.T) { } func TestAnUnreadableAskIsNamedAndNotListed(t *testing.T) { // never dropped silently - m := New(viewstate.ViewModule) + m := New(testView) e, _ := holdAsk(t) fill(m, Entry{Bucket: AsksBucket, Key: e.Key, Value: []byte("{"), At: t0}) s := m.Snapshot() @@ -83,7 +82,7 @@ func TestAnUnreadableAskIsNamedAndNotListed(t *testing.T) { // never dropped sil } func TestTableAndPageShowTheAsks(t *testing.T) { // 1345/AC2 - m := New(viewstate.ViewModule) + m := New(testView) e, a := holdAsk(t) fill(m, e) var out bytes.Buffer @@ -102,7 +101,7 @@ func TestTableAndPageShowTheAsks(t *testing.T) { // 1345/AC2 } // No ask, no section. out.Reset() - Table(&out, New(viewstate.ViewModule).Snapshot()) + Table(&out, New(testView).Snapshot()) if strings.Contains(out.String(), "ASKS") { t.Errorf("the table shows an ASKS section with no ask:\n%s", out.String()) } @@ -122,7 +121,7 @@ func TestTableAndPageShowTheAsks(t *testing.T) { // 1345/AC2 } func TestAHaveOfARemovedModuleIsShownRemovedNotLeftBehind(t *testing.T) { // 1370: the node-engine writes phase removed - m := New(viewstate.ViewModule) + m := New(testView) fill(m, haveE(t, "novox", "mesh-delivery", have(t, "b1", nodeengineclient.PhaseRemoved, nodeengineclient.HealthOK, ""), t0), haveE(t, "novox", "stray", have(t, "b2", nodeengineclient.PhaseRunning, nodeengineclient.HealthOK, ""), t0)) s := m.Snapshot() diff --git a/modules/mesh-delivery-view/internal/view/backlog_test.go b/modules/mesh-delivery-view/internal/view/backlog_test.go index 13049161..2031de62 100644 --- a/modules/mesh-delivery-view/internal/view/backlog_test.go +++ b/modules/mesh-delivery-view/internal/view/backlog_test.go @@ -9,7 +9,6 @@ import ( "time" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" - "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" "github.com/nats-io/nats.go/jetstream" ) @@ -54,7 +53,7 @@ func fakeSeats(t *testing.T, now time.Time) *Backlog { func TestThreeWaitingAsksAreShownWithTheOldestsAge(t *testing.T) { // 1887/A8a AC now := time.Date(2026, 10, 23, 12, 0, 0, 0, time.UTC) - m := New(viewstate.ViewModule) + m := New(testView) m.SetBacklog(fakeSeats(t, now)) rows := m.Snapshot().Backlog var check, image *BacklogRow @@ -89,7 +88,7 @@ func TestThreeWaitingAsksAreShownWithTheOldestsAge(t *testing.T) { // 1887/A8a A } func TestNoBacklogReaderGivesNoRows(t *testing.T) { - if got := New(viewstate.ViewModule).Snapshot().Backlog; got == nil || len(got) != 0 { + if got := New(testView).Snapshot().Backlog; got == nil || len(got) != 0 { t.Errorf("backlog = %#v", got) } } diff --git a/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go b/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go index 6def7e38..ed9cb2ff 100644 --- a/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go +++ b/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go @@ -6,7 +6,6 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) // I5 (issue 1851): from R4e the indexer writes the new form alone, and a module's fingerprint is built by the builder's key @@ -28,7 +27,7 @@ func builderKey(t *testing.T, module, fp2 string, b builds.BuilderBuild) Entry { } func TestAFingerprintOfTheNewFormIsShownAgainstItsBuilderKey(t *testing.T) { // I5 - m := New(viewstate.ViewModule) + m := New(testView) manifest := strings.Repeat("a", 64) d := "sha256:" + strings.Repeat("2", 64) fill(m, diff --git a/modules/mesh-delivery-view/internal/view/fingerprints_test.go b/modules/mesh-delivery-view/internal/view/fingerprints_test.go index df74d8dc..f0c9d0aa 100644 --- a/modules/mesh-delivery-view/internal/view/fingerprints_test.go +++ b/modules/mesh-delivery-view/internal/view/fingerprints_test.go @@ -12,7 +12,6 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) const ( @@ -67,7 +66,7 @@ func fpRow(t *testing.T, s Snapshot, module string) FingerprintRow { } func TestSnapshotListsTheCandidateGroups(t *testing.T) { // 1241/AC1 - m := New(viewstate.ViewModule) + m := New(testView) fill(m, candidate(t, "feat/x", pullOf("novox/mesh-delivery", 12, hA, "a", "b"), pullOf("novox/mesh-catalog", 300, hB, "c")), candidate(t, "feat/y", pullOf("novox/mesh-delivery", 13, hB))) @@ -95,7 +94,7 @@ func TestSnapshotListsTheCandidateGroups(t *testing.T) { // 1241/AC1 // 1955/L7 (ADR 0571 §1): the view reads no build record of the controller's: a module with no fingerprint of the new // form is said so, never compared with the controller's builds. func TestAModuleOfTheOldFormIsComparedWithNoBuild(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) fill(m, modEntry(t, "a", meshcatalog.ModulesByModuleValue{Fp: fF, Repository: "novox/mesh-delivery", Commit: hA}), modEntry(t, "b", meshcatalog.ModulesByModuleValue{None: "an artifact compiles a Go program from a build source that git trees do not pin: no fingerprint before release 4", Repository: "novox/mesh-delivery", Commit: hA})) @@ -108,7 +107,7 @@ func TestAModuleOfTheOldFormIsComparedWithNoBuild(t *testing.T) { } func shown(t *testing.T) *Model { - m := New(viewstate.ViewModule) + m := New(testView) fill(m, candidate(t, "feat/x", pullOf("novox/mesh-delivery", 12, hA, "a"), pullOf("novox/mesh-catalog", 300, hB, "c")), modEntry(t, "a", meshcatalog.ModulesByModuleValue{Fp2: fp2A, Repository: "novox/mesh-delivery", Commit: hA}), @@ -136,7 +135,7 @@ func TestTableAndPagePrintTheGroupsAndTheComparison(t *testing.T) { // 1241/AC6 } func TestUnreadableIndexerValuesAreNamed(t *testing.T) { // never dropped silently - m := New(viewstate.ViewModule) + m := New(testView) fill(m, Entry{Bucket: CandidatesBucket, Key: "feat/x", Value: []byte("{"), At: t0}, Entry{Bucket: ModulesBucket, Key: "a", Value: []byte("{"), At: t0}) s := m.Snapshot() diff --git a/modules/mesh-delivery-view/internal/view/holds_test.go b/modules/mesh-delivery-view/internal/view/holds_test.go index efea834d..05efe086 100644 --- a/modules/mesh-delivery-view/internal/view/holds_test.go +++ b/modules/mesh-delivery-view/internal/view/holds_test.go @@ -36,7 +36,7 @@ func answered(t *testing.T, key, id, option string) Entry { // 1906/N23-AC1: given holds in the assigner's wants, the view lists each with its node, its cause in words, its hold ask and // the answer that stands for that asking; a hold without an ask says so, and a held key is never taken for a want. func TestTheViewListsEveryHoldWithItsNodeCauseAndAnswer(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) e, a := holdAsk(t) fill(m, e, heldE(t, "plex", fpNew, "ace", "health failed, phase running: connection refused"), answered(t, e.Key, a.ID, "keep"), heldE(t, "web", fpNew, "g14", "health failed")) @@ -60,7 +60,7 @@ func TestTheViewListsEveryHoldWithItsNodeCauseAndAnswer(t *testing.T) { // writes its answer "release" to that asking under the ask's view key, though the ask was answered; the fingerprint may be the // start of its hex. The same answer again, an unknown hold and another option are refused, and write nothing. func TestAKeptHoldCanBeReleased(t *testing.T) { - m, w := New(viewstate.ViewModule), &memWriter{} + m, w := New(testView), &memWriter{} m.SetWriter(w) e, a := holdAsk(t) fill(m, e, heldE(t, "plex", fpNew, "ace", "health failed"), answered(t, e.Key, a.ID, "keep")) diff --git a/modules/mesh-delivery-view/internal/view/reach_test.go b/modules/mesh-delivery-view/internal/view/reach_test.go index 54e10c41..1616f662 100644 --- a/modules/mesh-delivery-view/internal/view/reach_test.go +++ b/modules/mesh-delivery-view/internal/view/reach_test.go @@ -65,7 +65,7 @@ func TestTheViewDerivesHowFarEachRepositoryReached(t *testing.T) { if err != nil { t.Fatal(err) } - return Entry{Bucket: viewstate.BucketsOf(viewstate.ViewModule).Reach, Key: key, Value: v, At: t0} + return Entry{Bucket: viewstate.BucketsOf(testView).Reach, Key: key, Value: v, At: t0} } taken := func(repository, merge string) Entry { key, _ := trunk.RepositoryKey(repository) @@ -167,7 +167,7 @@ func TestTheViewDerivesHowFarEachRepositoryReached(t *testing.T) { then: []Entry{haveFP(t, "ace", "mail", fpMail, nodeengineclient.HealthOK)}}, } { t.Run(tc.name, func(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) var written []ReachWrite var said []DeliveredEvent refuse := tc.refused diff --git a/modules/mesh-delivery-view/internal/view/serve_test.go b/modules/mesh-delivery-view/internal/view/serve_test.go index 246bfb0b..be71e360 100644 --- a/modules/mesh-delivery-view/internal/view/serve_test.go +++ b/modules/mesh-delivery-view/internal/view/serve_test.go @@ -12,12 +12,11 @@ import ( "testing" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) func served(t *testing.T) (string, *Model) { t.Helper() - m := New(viewstate.ViewModule) + m := New(testView) fill(m, base(t)...) fill(m, haveE(t, "a", "w", have(t, "b9", nodeengineclient.PhaseRunning, nodeengineclient.HealthOK, ""), t0)) dir, err := os.MkdirTemp(os.Getenv("TMPDIR"), "s") @@ -114,7 +113,7 @@ func TestWebIsTheSameRowsAndReadOnly(t *testing.T) { // 1134/AC6 func watchmanSnapshot(t *testing.T) *Model { t.Helper() - m := New(viewstate.ViewModule) + m := New(testView) fill(m, presenceE(t, "a", false, t0), stuckE(t, "node-engine_have", "a.x", "a report from a", t0, false), Entry{Bucket: PresenceBucket, Key: "c", Value: []byte(`{"v":9}`), At: t0}) return m diff --git a/modules/mesh-delivery-view/internal/view/view_test.go b/modules/mesh-delivery-view/internal/view/view_test.go index 6824b735..ce10ae92 100644 --- a/modules/mesh-delivery-view/internal/view/view_test.go +++ b/modules/mesh-delivery-view/internal/view/view_test.go @@ -18,7 +18,6 @@ import ( healers "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhealers" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/motion" ) @@ -83,7 +82,7 @@ func base(t *testing.T) []Entry { } func TestRowsPerAssignedModuleAndNode(t *testing.T) { // 1134/AC1 - m := New(viewstate.ViewModule) + m := New(testView) fill(m, base(t)...) s := m.Snapshot() if len(s.Rows) != 4 || s.Counted() != 4 { @@ -102,14 +101,14 @@ func TestRowsPerAssignedModuleAndNode(t *testing.T) { // 1134/AC1 } func TestLeftBehindIsWhatTheAssignmentsDoesNotPut(t *testing.T) { // 1134/AC3, issue 774 (the seat's assignments) - m := New(viewstate.ViewModule) + m := New(testView) fill(m, base(t)...) fill(m, place(t, "b", "x")) // z taken off b s := m.Snapshot() if r := find(t, s, "b", "z"); r.Status != StatusLeftBehind || s.Counted() != 3 { t.Errorf("status = %q counted %d, want %q and 3", r.Status, s.Counted(), StatusLeftBehind) } - m = New(viewstate.ViewModule) + m = New(testView) fill(m, base(t)...) fill(m, haveE(t, "a", "w", have(t, "b9", nodeengineclient.PhaseRunning, nodeengineclient.HealthOK, ""), t0)) // placed nowhere s = m.Snapshot() @@ -123,7 +122,7 @@ func TestLeftBehindIsWhatTheAssignmentsDoesNotPut(t *testing.T) { // 1134/AC3, i } func TestUnknownVersionSaysSo(t *testing.T) { // 1134/AC4 - m := New(viewstate.ViewModule) + m := New(testView) fill(m, base(t)...) before := m.Snapshot() fill(m, haveE(t, "a", "x", []byte(`{"v":9,"phase":"running","health":"ok"}`), t0)) @@ -147,7 +146,7 @@ func TestUnknownVersionSaysSo(t *testing.T) { // 1134/AC4 } func TestOnlyTheAffectedRowChanges(t *testing.T) { // 1134/AC5 - m := New(viewstate.ViewModule) + m := New(testView) fill(m, base(t)...) before := m.Snapshot() fill(m, haveE(t, "b", "x", have(t, "b1", nodeengineclient.PhaseRunning, nodeengineclient.HealthOK, ""), t0.Add(9*time.Minute))) @@ -175,7 +174,7 @@ func TestOnlyTheAffectedRowChanges(t *testing.T) { // 1134/AC5 t.Fatal("a deleted have must read as no have") } // a restart rebuilds the same rows from last values - a, b := New(viewstate.ViewModule), New(viewstate.ViewModule) + a, b := New(testView), New(testView) es := base(t) fill(a, es...) fill(b, es...) @@ -185,7 +184,7 @@ func TestOnlyTheAffectedRowChanges(t *testing.T) { // 1134/AC5 } func TestNodeRow(t *testing.T) { // 1134/AC1 (the node's own key gives a node row) - m := New(viewstate.ViewModule) + m := New(testView) v, _ := nodeengineclient.EncodeHaveNode(nodeengine.HaveByNodeNodeValue{Windows: []map[string]any{{}, {}}, Busy: []map[string]any{{"a": 1}}, Strays: []map[string]any{}}) fill(m, Entry{Bucket: HaveBucket, Key: "a.node", Value: v, At: t0}) n := m.Snapshot().Nodes @@ -219,7 +218,7 @@ func TestTheWatchmansKeysAndStatus(t *testing.T) { } func offlineAndStuckAreListed(t *testing.T) { // 1168/AC2 - m := New(viewstate.ViewModule) + m := New(testView) fill(m, base(t)...) fill(m, presenceE(t, "a", false, t0), @@ -247,7 +246,7 @@ func offlineAndStuckAreListed(t *testing.T) { // 1168/AC2 } func unknownWatchmanVersionIsUnreadableNotDropped(t *testing.T) { // 1168/AC3 - m := New(viewstate.ViewModule) + m := New(testView) fill(m, Entry{Bucket: PresenceBucket, Key: "c", Value: []byte(`{"v":9,"online":false}`), At: t0}, Entry{Bucket: StuckBucket, Key: "node-engine_have.c.x", Value: []byte(`{"v":9}`), At: t0}, @@ -346,3 +345,6 @@ func statusDerivesEachPartFromItsBucket(t *testing.T) { t.Errorf("an empty mesh = %+v, want well", st) } } + +// testView is the module the tests' view runs as, its credential's: its buckets and events are named from it (design 47 G A-296). +const testView = "acme-view" diff --git a/modules/mesh-delivery-view/internal/view/wants_test.go b/modules/mesh-delivery-view/internal/view/wants_test.go index 5a177864..f0804d9f 100644 --- a/modules/mesh-delivery-view/internal/view/wants_test.go +++ b/modules/mesh-delivery-view/internal/view/wants_test.go @@ -14,7 +14,6 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" "git.novox.be/novox/mesh-sdk/go/keys" ) @@ -88,7 +87,7 @@ func sourceRowOf(m *Model, branch string) *SourceRow { // 1906/D7 AC7: every want is a row beside the have of its node, with where it stands. func TestEveryWantIsARowAgainstItsHave(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) fill(m, wantE(t, "ace", "web", meshwantsclient.Want{Fp: fpNew}), haveFP(t, "ace", "web", fpNew, nodeengineclient.HealthOK), wantE(t, "ace", "mail", meshwantsclient.Want{Fp: fpNew}), haveFP(t, "ace", "mail", fpOld, nodeengineclient.HealthOK), @@ -124,7 +123,7 @@ func TestEveryWantIsARowAgainstItsHave(t *testing.T) { // 1906/D7 AC7: a source revision is delivered when every want equals its module's fingerprint and every have equals its // want, healthy; one failed have shows it not delivered and names the module. func TestASourceRevisionIsDerivedFromWantsAndHaves(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) var said []DeliveredEvent m.SetDeliveredEvent(func(e DeliveredEvent) error { if e.Repository == "" { @@ -184,13 +183,13 @@ func TestASourceRevisionIsDerivedFromWantsAndHaves(t *testing.T) { } func TestNoSourceRevisionHeldMeansNoStateIsDerived(t *testing.T) { - if s := New(viewstate.ViewModule).Snapshot().Sources; len(s) != 0 { + if s := New(testView).Snapshot().Sources; len(s) != 0 { t.Errorf("source = %+v", s) } } func TestTheWantsPageSaysWantsAgainstHaves(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) fill(m, wantE(t, "ace", "web", meshwantsclient.Want{Fp: fpNew}), haveFP(t, "ace", "web", fpOld, nodeengineclient.HealthOK)) text := wantText(m.Snapshot()) if len(text) != 1 || text[0][0] != "ace" || text[0][1] != "web" || text[0][2] != fpNew || text[0][3] != fpOld || text[0][4] != WantPending || text[0][5] != "none" { @@ -202,7 +201,7 @@ func TestTheWantsPageSaysWantsAgainstHaves(t *testing.T) { func TestTheJudgementOfTheMoveIsShownBesideTheWant(t *testing.T) { // 1955/L7 (ADR 0571 §6): the judgement is the node agent's, in its have waiting for a yes; the controller's composed copy // is not read. - m := New(viewstate.ViewModule) + m := New(testView) h, err := nodeengineclient.EncodeHave(nodeengine.HaveByNodeModuleValue{Fp: fpOld, Phase: nodeengineclient.PhaseWaitingYes, Health: nodeengineclient.HealthOK, Judgement: nodeengineclient.JudgedCannot, Waits: "sha256:" + strings.Repeat("c", 64), Detail: "the composition it runs is gone"}) if err != nil { @@ -222,7 +221,7 @@ func TestTheJudgementOfTheMoveIsShownBesideTheWant(t *testing.T) { // 1906/D9 (asked by the lead for issue 1946): the view says, once for each source revision, that it is delivered: the event the // issue tracker derives "fix delivered" from, in place of the gate's states that go in release 6 (ADR 0539 §17). func TestTheViewSaysOnceThatASourceRevisionIsDelivered(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) var said []DeliveredEvent refuse := true // the bus refuses the first try to say it (issue 1126): it is said at the next change, not lost m.SetDeliveredEvent(func(e DeliveredEvent) error { @@ -268,7 +267,7 @@ func TestTheViewSaysOnceThatASourceRevisionIsDelivered(t *testing.T) { // Review round 1 (view notes): the controller no longer writes the build of an assignment (C6), so a row reads the want and the // have: the row shows the fingerprint wanted and waits while the node runs another. func TestARowReadsTheWantWhenTheAssignmentNamesNoBuild(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) fill(m, place(t, "ace", "web"), wantE(t, "ace", "web", meshwantsclient.Want{Fp: fpNew}), haveFP(t, "ace", "web", fpOld, nodeengineclient.HealthOK)) r := find(t, m.Snapshot(), "ace", "web") if r.Assigned != fpNew || r.Have != fpOld || !strings.Contains(r.Waits, "has not applied") { @@ -283,7 +282,7 @@ func TestARowReadsTheWantWhenTheAssignmentNamesNoBuild(t *testing.T) { // Review round 1 (view notes, issue 1150): a module whose name holds a dot has its have under the escaped key; the row finds it, // and a have nothing is assigned to keeps the module's name. func TestADottedModuleNameIsFoundAndKept(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) // The seat's assignments refuses a dotted module name (mesh-sdk meshmoduleassigner.Assignments), so such a module is never placed: // its have is a row left behind under its own name. fill(m, place(t, "ace"), wantE(t, "ace", "novox.be", meshwantsclient.Want{Fp: fpNew}), haveFP(t, "ace", "novox.be", fpNew, nodeengineclient.HealthOK), @@ -321,7 +320,7 @@ func types(said []MotionEvent) string { } func TestAModuleInMotionIsSaidMovingThenSettledOnceEach(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) said := motionLog(m) fill(m, haveFP(t, "ace", "web", fpOld, nodeengineclient.HealthOK)) if len(*said) != 0 { @@ -365,7 +364,7 @@ func TestAModuleInMotionIsSaidMovingThenSettledOnceEach(t *testing.T) { } func TestAModuleHeldOrFailedIsSaidStuckWithItsWords(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) said := motionLog(m) fill(m, wantE(t, "ace", "web", meshwantsclient.Want{Fp: fpNew})) b, _ := nodeengineclient.EncodeHave(nodeengine.HaveByNodeModuleValue{Fp: fpOld, Phase: nodeengineclient.PhaseHeld, Health: nodeengineclient.HealthWaits, Detail: "no space left"}) @@ -378,7 +377,7 @@ func TestAModuleHeldOrFailedIsSaidStuckWithItsWords(t *testing.T) { t.Errorf("stuck said twice: %q", types(*said)) } // failed on the wanted fingerprint - m2 := New(viewstate.ViewModule) + m2 := New(testView) said2 := motionLog(m2) fill(m2, wantE(t, "g14", "web", meshwantsclient.Want{Fp: fpNew}), haveFP(t, "g14", "web", fpNew, nodeengineclient.HealthFailed)) if types(*said2) != "moving,stuck" || (*said2)[1].Body.Outcome != "failed" { @@ -387,7 +386,7 @@ func TestAModuleHeldOrFailedIsSaidStuckWithItsWords(t *testing.T) { } func TestAWantTheWatchmanSaysStoppedMovingIsSaidStuckPastItsBound(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) said := motionLog(m) fill(m, wantE(t, "ace", "web", meshwantsclient.Want{Fp: fpNew}), haveFP(t, "ace", "web", fpOld, nodeengineclient.HealthOK)) // The watchman names the wants' real bucket at their holder, which the model reads from the holder followed (A-303 (corrected)). @@ -404,7 +403,7 @@ func TestAWantTheWatchmanSaysStoppedMovingIsSaidStuckPastItsBound(t *testing.T) } func TestANodeThatSettlesWithoutBeingSeenMovingSaysNothing(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) said := motionLog(m) fill(m, haveFP(t, "ace", "web", fpNew, nodeengineclient.HealthOK), wantE(t, "ace", "web", meshwantsclient.Want{Fp: fpNew})) if len(*said) != 0 { @@ -415,7 +414,7 @@ func TestANodeThatSettlesWithoutBeingSeenMovingSaysNothing(t *testing.T) { // Nothing is said of a module in motion before the buckets have been read: a want read ahead of its have is not a node behind. What is // in motion when they have been read is said then, and a module that settles after is said settled. func TestMotionIsSaidOnlyOnceTheBucketsHaveBeenRead(t *testing.T) { - m := New(viewstate.ViewModule) + m := New(testView) var said []MotionEvent m.SetMotionEvent(func(e MotionEvent) error { said = append(said, e); return nil }) fill(m, wantE(t, "ace", "web", meshwantsclient.Want{Fp: fpNew}), wantE(t, "ace", "mail", meshwantsclient.Want{Fp: fpNew})) diff --git a/modules/mesh-delivery-view/manifest_test.go b/modules/mesh-delivery-view/manifest_test.go index b4eb7c03..bbb62347 100644 --- a/modules/mesh-delivery-view/manifest_test.go +++ b/modules/mesh-delivery-view/manifest_test.go @@ -279,9 +279,6 @@ func TestManifestIsTakenAndReadsOnly(t *testing.T) { // 1134/AC7 t.Errorf("the manifest names %s: the modules are the catalog half's (ADR 0663)", name) } } - if viewstate.ViewModule != m.Module { - t.Errorf("the view names itself %s, its manifest %s", viewstate.ViewModule, m.Module) - } // A-296: its own buckets are named from its credential's module, each a state its manifest keeps. var own []string for _, s := range m.State { diff --git a/modules/mesh-delivery-view/viewstate/reach.go b/modules/mesh-delivery-view/viewstate/reach.go index 96e81e65..b2b837ca 100644 --- a/modules/mesh-delivery-view/viewstate/reach.go +++ b/modules/mesh-delivery-view/viewstate/reach.go @@ -14,9 +14,6 @@ import ( "git.novox.be/novox/mesh-sdk/go/keys" ) -// ViewModule is the module of the delivery view. -const ViewModule = "mesh-delivery-view" - // modulesHistory is the revisions the indexer's state `modules` keeps per key, the most changes a module's reach keeps. const modulesHistory = 20