From 0be81ae03665e3b4374d6c3199e9bb67d5b9a352 Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 12 Nov 2026 10:41:44 +0100 Subject: [PATCH] Join 11: the merged heads compile where no area's fix is owed The join's importers name the delivery repository's moved contracts and sdk (MV1), node-tools' tests use mesh-sdk's gate, the duplicate node-engine claim rule of the reader release gives way to G's, and the assigner names its first watched branch, never a constant. The seat holders' AnswerSeat callers are area 6's. Builds: design 47 G join 11 (merge of fix round 11) Claude-Session: https://claude.ai/code/session_01NcbgfGKaxw984XyAPfLm4h --- modules/distribution/cmd/distribution/builds.go | 4 ++-- modules/distribution/cmd/distribution/builds_test.go | 2 +- modules/distribution/cmd/distribution/main.go | 2 +- .../distribution/cmd/distribution/whole_integration_test.go | 4 ++-- modules/nats/cmd/nats-tools/keep_test.go | 2 +- modules/nats/cmd/nats-tools/keeper_integration_test.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/distribution/cmd/distribution/builds.go b/modules/distribution/cmd/distribution/builds.go index 325584298..5c1efed45 100644 --- a/modules/distribution/cmd/distribution/builds.go +++ b/modules/distribution/cmd/distribution/builds.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // buildSeatPrefix starts the name of every seat a build module claims. diff --git a/modules/distribution/cmd/distribution/builds_test.go b/modules/distribution/cmd/distribution/builds_test.go index 058ebe475..92467db99 100644 --- a/modules/distribution/cmd/distribution/builds_test.go +++ b/modules/distribution/cmd/distribution/builds_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) func entry(claims ...string) catalog.CatalogEntry { diff --git a/modules/distribution/cmd/distribution/main.go b/modules/distribution/cmd/distribution/main.go index b79f2aeec..abdc0f9cd 100644 --- a/modules/distribution/cmd/distribution/main.go +++ b/modules/distribution/cmd/distribution/main.go @@ -21,7 +21,7 @@ import ( "time" meshconditions "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views" "github.com/nats-io/nats.go/jetstream" diff --git a/modules/distribution/cmd/distribution/whole_integration_test.go b/modules/distribution/cmd/distribution/whole_integration_test.go index 764c5bc9d..c36d44869 100644 --- a/modules/distribution/cmd/distribution/whole_integration_test.go +++ b/modules/distribution/cmd/distribution/whole_integration_test.go @@ -29,8 +29,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/testbus" "distribution/internal/holder" diff --git a/modules/nats/cmd/nats-tools/keep_test.go b/modules/nats/cmd/nats-tools/keep_test.go index a3d2035fc..a8104d208 100644 --- a/modules/nats/cmd/nats-tools/keep_test.go +++ b/modules/nats/cmd/nats-tools/keep_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "nats-tools/internal/keeper" ) diff --git a/modules/nats/cmd/nats-tools/keeper_integration_test.go b/modules/nats/cmd/nats-tools/keeper_integration_test.go index 6cc5cbb94..2744d2f45 100644 --- a/modules/nats/cmd/nats-tools/keeper_integration_test.go +++ b/modules/nats/cmd/nats-tools/keeper_integration_test.go @@ -25,7 +25,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/seatdef"