Node-engine: the have, the node's facts, the record, the health report and the data items are the seat's contract types, written through the node-engine client; the interim bridge is gone (Have group, ADR 0634 §1, §4; issue 1966)

Claude-Session: https://claude.ai/code/session_01NcbgfFSnn24M3GcqttoU7i

internal/selfcompose/data_test.go

@@ -3,6 +3,9 @@ package selfcompose
 import (
 	"context"
 	"errors"
+	"git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient"
+	"git.novox.be/novox/mesh-contracts/go/seats/nodeengine"
+	"github.com/novox/mesh-host/internal/buckets"
 	engcomp "github.com/novox/mesh-host/internal/compositions"
 	"slices"
 	"strings"
@@ -86,7 +89,7 @@ func TestTheEngineKeepsEachPlacedModulesDataItems(t *testing.T) {
 	var said []string
 	env := Env{Node: "n1", Data: store, Say: func(s string) { said = append(said, s) }}
 	// The engine's grant lets it read its own node's keys, as the listing at a run's first pass does, and no other's.
-	if !grantAllows(t, "n1", delivery.EngineDataBucket, "n1.*") || grantAllows(t, "n1", delivery.EngineDataBucket, "n2.*") {
+	if !grantAllows(t, "n1", buckets.Data, "n1.*") || grantAllows(t, "n1", buckets.Data, "n2.*") {
 		t.Error("the node's grant reads other keys of the engine's state data than its own")
 	}
 	c := New(env)
@@ -105,15 +108,15 @@ func TestTheEngineKeepsEachPlacedModulesDataItems(t *testing.T) {
 		deletes []string
 		asked   int
 		// want is each key's items and digest after the step.
-		want map[string]delivery.EngineData
+		want map[string]nodeengine.DataByNodeModuleValue
 	}{
 		{name: "the run's first pass writes each module's items and deletes what left", due: true,
 			items:   map[string][]catalogue.PlacedDataItem{"web": {item("web", "db", "/srv/web/db")}, "oldie": {item("oldie", "x", "/srv/oldie")}, "bare": nil},
 			digests: map[string]string{webKey: "sha256:w1", nodeKey: "sha256:n1"},
 			puts:    []string{"n1.oldie", "n1.web"}, deletes: []string{"n1.gone"}, asked: 1,
-			want: map[string]delivery.EngineData{
-				"n1.web":   {Module: "web", Digest: "sha256:w1", Items: []catalogue.PlacedDataItem{item("web", "db", "/srv/web/db")}},
-				"n1.oldie": {Module: "oldie", Digest: "sha256:n1", Items: []catalogue.PlacedDataItem{item("oldie", "x", "/srv/oldie")}}}},
+			want: map[string]nodeengine.DataByNodeModuleValue{
+				"n1.web":   {Module: "web", Digest: "sha256:w1", Items: placedItems([]catalogue.PlacedDataItem{item("web", "db", "/srv/web/db")})},
+				"n1.oldie": {Module: "oldie", Digest: "sha256:n1", Items: placedItems([]catalogue.PlacedDataItem{item("oldie", "x", "/srv/oldie")})}}},
 		{name: "a pass that handed nothing new reads nothing", due: false, asked: 1},
 		{name: "a pass that changes no module's items writes nothing", due: true,
 			items:   map[string][]catalogue.PlacedDataItem{"web": {item("web", "db", "/srv/web/db")}, "oldie": {item("oldie", "x", "/srv/oldie")}},
@@ -126,8 +129,8 @@ func TestTheEngineKeepsEachPlacedModulesDataItems(t *testing.T) {
 		{name: "a module whose composition changed its items is written again", due: false,
 			items:   map[string][]catalogue.PlacedDataItem{"web": {item("web", "db", "/srv/web/db2")}, "oldie": {item("oldie", "x", "/srv/oldie")}},
 			digests: map[string]string{webKey: "sha256:w2", nodeKey: "sha256:n1"}, puts: []string{"n1.web"}, asked: 5,
-			want: map[string]delivery.EngineData{
-				"n1.web": {Module: "web", Digest: "sha256:w2", Items: []catalogue.PlacedDataItem{item("web", "db", "/srv/web/db2")}}}},
+			want: map[string]nodeengine.DataByNodeModuleValue{
+				"n1.web": {Module: "web", Digest: "sha256:w2", Items: placedItems([]catalogue.PlacedDataItem{item("web", "db", "/srv/web/db2")})}}},
 		{name: "a module that left the node is deleted", due: true,
 			items:   map[string][]catalogue.PlacedDataItem{"oldie": {item("oldie", "x", "/srv/oldie")}},
 			digests: map[string]string{nodeKey: "sha256:n1"}, deletes: []string{"n1.web"}, asked: 6},
@@ -136,8 +139,8 @@ func TestTheEngineKeepsEachPlacedModulesDataItems(t *testing.T) {
 			items:   map[string][]catalogue.PlacedDataItem{"web": {item("web", "db", "/srv/web/db")}},
 			held:    map[string]string{"oldie": "the manifest of oldie is refused: a bar item is no icon"},
 			digests: map[string]string{webKey: "sha256:w3", nodeKey: "sha256:n1"}, puts: []string{"n1.web"}, asked: 7,
-			want: map[string]delivery.EngineData{
-				"n1.web": {Module: "web", Digest: "sha256:w3", Items: []catalogue.PlacedDataItem{item("web", "db", "/srv/web/db")}}}},
+			want: map[string]nodeengine.DataByNodeModuleValue{
+				"n1.web": {Module: "web", Digest: "sha256:w3", Items: placedItems([]catalogue.PlacedDataItem{item("web", "db", "/srv/web/db")})}}},
 	} {
 		t.Run(step.name, func(t *testing.T) {
 			store.mu.Lock()
@@ -159,7 +162,7 @@ func TestTheEngineKeepsEachPlacedModulesDataItems(t *testing.T) {
 				t.Errorf("owed a pass: %v after %s; want after %s", c.owed.Load(), wait, step.owed)
 			}
 			for key, want := range step.want {
-				got, err := delivery.DecodeEngineData(store.kv[key])
+				got, err := nodeengineclient.DecodeData(store.kv[key])
 				if err != nil || got.Node != "n1" || got.Module != want.Module || got.Digest != want.Digest ||
 					!slices.Equal(got.Items, want.Items) {
 					t.Errorf("%s holds %+v (%v), want %+v", key, got, err, want)