MH-2b: the node-engine reads the want by the real contract: composed, kept-on and newest go
A want carries no composed digest, no keeping node and no newest build (design 47 H 750, H-A-37): the agent takes the digest from the composition the node made for the want's build, the shadow's resolution around a missing entry (A-405) and KeptBuildOf's keeping node go, and the artifact is fetched from the store. Tests of the removed behaviour go. Builds: design 47 H §750; H-A-37 Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy
This commit is contained in:
@@ -141,7 +141,7 @@ type bed struct {
|
||||
|
||||
func newBed(t *testing.T) *bed {
|
||||
b := &bed{t: t, wants: newFeed(), comps: newFeed(), haves: &haves{}}
|
||||
b.env = Env{Node: node, Wants: b.wants, Composed: b.comps, Haves: b.haves,
|
||||
b.env = Env{Node: node, SelfComposed: true, Wants: b.wants, Composed: b.comps, Haves: b.haves,
|
||||
Apply: func(_ context.Context, c compositions.Composed, others []compositions.Composed) Result {
|
||||
if b.during != nil {
|
||||
b.during()
|
||||
@@ -260,10 +260,10 @@ func encodedAs(t *testing.T, c compositions.Composed, key string) (string, []byt
|
||||
return key, raw, digest
|
||||
}
|
||||
|
||||
func wantFor(t *testing.T, module, fp, digest, backup string) (string, []byte) {
|
||||
func wantFor(t *testing.T, module, fp, _, backup string) (string, []byte) {
|
||||
t.Helper()
|
||||
key := meshwants.WantsByWantNodeModuleKey(node, module)
|
||||
raw, err := bucketstest.Want(meshwants.WantsByWantNodeModuleValue{Fp: fp, Composed: digest, Backup: backup})
|
||||
raw, err := bucketstest.Want(meshwants.WantsByWantNodeModuleValue{Fp: fp, Backup: backup})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -317,17 +317,6 @@ func TestAWantAndItsCompositionApplyTheModuleAndTheHaveNamesBoth(t *testing.T) {
|
||||
return slices.Equal(b.settled, []string{"web"}) && b.settledRan[0]
|
||||
})
|
||||
|
||||
// A want naming a digest the composition at that fingerprint does not have: nothing is applied.
|
||||
fp2 := fpOf("b")
|
||||
ck2, craw2, _ := composition(t, "web", fp2, false, file("web", "x", "2"))
|
||||
b.comps.put(ck2, craw2)
|
||||
wk2, wraw2 := wantFor(t, "web", fp2, "sha256:"+strings.Repeat("0", 64), "")
|
||||
b.wants.put(wk2, wraw2)
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
if got := b.appliedList(); len(got) != 1 {
|
||||
t.Fatalf("a want naming another digest applied the composition: %v", got)
|
||||
}
|
||||
|
||||
// Design 47 H section 750: a want names a version, never a part's digest, so the node-engine reads no digests of a want:
|
||||
// a composition fetching archives is applied, and no have is held for a difference between a want and its digests.
|
||||
d1, d2 := "sha256:"+strings.Repeat("1", 64), "sha256:"+strings.Repeat("2", 64)
|
||||
@@ -1035,8 +1024,8 @@ func TestTheOrderTheChangedWantsAreAppliedIn(t *testing.T) {
|
||||
if m.runs != "" {
|
||||
b.runs[m.name] = fpOf(m.runs)
|
||||
}
|
||||
ck, craw, dig := composition(t, m.name, fp, false, file(m.name, "x", "1"))
|
||||
raw, err := bucketstest.Want(meshwants.WantsByWantNodeModuleValue{Fp: fp, Composed: dig, Pipeline: m.pipeline, Rank: m.rank})
|
||||
ck, craw, _ := composition(t, m.name, fp, false, file(m.name, "x", "1"))
|
||||
raw, err := bucketstest.Want(meshwants.WantsByWantNodeModuleValue{Fp: fp, Pipeline: m.pipeline, Rank: m.rank})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -1520,32 +1509,6 @@ func TestACompositionWhoseResourcesWereRemovedIsAppliedAgain(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// The composition a want names is applied from the key's history when a newer one has replaced it under the same key:
|
||||
// a want held at a fingerprint keeps naming the digest it was written with, and the controller writes every new
|
||||
// composition at that fingerprint over the same key (ADR 0539 clause 1, the sweep's kept revisions; issue 1945, live on
|
||||
// 2026-10-25: shanks' node-tools composition had digest 575a5c96, its held want named a36e63c8, and nothing was applied).
|
||||
func TestTheRevisionAWantNamesIsAppliedFromHistory(t *testing.T) {
|
||||
b := newBed(t)
|
||||
fp := fpOf("a")
|
||||
ck, oldRaw, oldDig := composition(t, "node-tools", fp, false, file("node-tools", "x", "old"))
|
||||
_, newRaw, _ := composition(t, "node-tools", fp, false, file("node-tools", "x", "new"))
|
||||
b.comps.before(ck, newRaw) // the key's latest value
|
||||
wk, wraw := wantFor(t, "node-tools", fp, oldDig, "")
|
||||
b.wants.before(wk, wraw)
|
||||
b.env.Revisions = func(_ context.Context, key string) ([]Update, error) {
|
||||
if key != ck {
|
||||
return nil, nil
|
||||
}
|
||||
return []Update{{Key: ck, Value: oldRaw, Revision: 3}, {Key: ck, Value: newRaw, Revision: 7}}, nil
|
||||
}
|
||||
stop := b.run()
|
||||
defer stop()
|
||||
eventually(t, "the revision the want names was not applied", func() bool { return len(b.appliedList()) == 1 })
|
||||
if h := b.haves.last("node-tools"); h.Composed != oldDig {
|
||||
t.Fatalf("the have names %s, want %s", h.Composed, oldDig)
|
||||
}
|
||||
}
|
||||
|
||||
// 1945/AC18 and issue 924 (unit): what runs of a module the agent has not taken yet carries the filled paths the
|
||||
// filling judges by. From the kept declaration while the module has no have naming a composition ("not named as filled"
|
||||
// for claude-code and screen-lock, 2026-10-25); from the composition its have names once it has one, the kept
|
||||
|
||||
Reference in New Issue
Block a user