diff --git a/go.mod b/go.mod index 13f77b7..64e7a1b 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/google/uuid v1.6.0 github.com/onsi/gomega v1.39.1 github.com/sei-protocol/sei-config v0.0.19 - github.com/sei-protocol/seictl v0.0.56 + github.com/sei-protocol/seictl v0.0.57 github.com/urfave/cli/v3 v3.6.1 go.opentelemetry.io/otel v1.43.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0 diff --git a/go.sum b/go.sum index d750601..8b80e74 100644 --- a/go.sum +++ b/go.sum @@ -1788,6 +1788,8 @@ github.com/sei-protocol/seictl v0.0.55 h1:JZ15hoAS7ft3LL85SeYtkP3Gr/oMlEQnBjhefb github.com/sei-protocol/seictl v0.0.55/go.mod h1:sDWY/llzQPnblG/WS6uQ7vqDtshNQ0WJTJzRUgmfFpg= github.com/sei-protocol/seictl v0.0.56 h1:zRCZdGiRrvP+zv/DYhmfP570MOR9nO6o9VWncABkJSo= github.com/sei-protocol/seictl v0.0.56/go.mod h1:sDWY/llzQPnblG/WS6uQ7vqDtshNQ0WJTJzRUgmfFpg= +github.com/sei-protocol/seictl v0.0.57 h1:qyWpv5Iznlp7tQiAU0TYzlFZYHOohfmbVXn/AJp1Co8= +github.com/sei-protocol/seictl v0.0.57/go.mod h1:EnEHAT5/egP4aIB4Ir4tg5eK2150RfB9Ohw5xmpZQGE= github.com/sei-protocol/seilog v0.0.3 h1:Zi7oWXdX5jv92dY8n482xH032LtNebC89Y+qYZlBn0Y= github.com/sei-protocol/seilog v0.0.3/go.mod h1:CKg58wraWnB3gRxWQ0v1rIVr0gmDHjkfP1bM2giKFFU= github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= diff --git a/internal/planner/archive_test.go b/internal/planner/archive_test.go index 08b7497..b045677 100644 --- a/internal/planner/archive_test.go +++ b/internal/planner/archive_test.go @@ -49,10 +49,10 @@ func TestArchivePlanner_BlockSyncProgression(t *testing.T) { } } -// Peers now reach config via the config-apply override -// (network.p2p.persistent_peers), not a sidecar discover-peers task. The -// controller resolves spec.peers into status.resolvedPeers before plan build; -// the planner reads that set. The plan must NOT contain a discover-peers task. +// Peers reach config via the config-apply override +// (network.p2p.persistent_peers): the controller resolves spec.peers into +// status.resolvedPeers before plan build, and the planner folds that set into +// the override. func TestArchivePlanner_WithPeers(t *testing.T) { node := &seiv1alpha1.SeiNode{ ObjectMeta: metav1.ObjectMeta{Name: "archive-0", Namespace: "pacific-1"}, @@ -75,15 +75,6 @@ func TestArchivePlanner_WithPeers(t *testing.T) { t.Fatalf("BuildPlan: %v", err) } - types := make([]string, 0, len(plan.Tasks)) - for _, task := range plan.Tasks { - types = append(types, task.Type) - } - - if slices.Contains(types, TaskDiscoverPeers) { - t.Errorf("archive plan must not contain discover-peers (controller-owned peering), got %v", types) - } - intent := configApplyIntent(t, plan) if got := intent.Overrides[keyP2PPersistentPeers]; got != "peer1@host:26656" { t.Errorf("persistent_peers override = %q, want %q", got, "peer1@host:26656") diff --git a/internal/planner/planner.go b/internal/planner/planner.go index 4427d39..6022468 100644 --- a/internal/planner/planner.go +++ b/internal/planner/planner.go @@ -30,7 +30,6 @@ const unknownValue = "unknown" const ( TaskSnapshotRestore = sidecar.TaskTypeSnapshotRestore - TaskDiscoverPeers = sidecar.TaskTypeDiscoverPeers TaskConfigureGenesis = sidecar.TaskTypeConfigureGenesis TaskConfigureStateSync = sidecar.TaskTypeConfigureStateSync TaskConfigApply = sidecar.TaskTypeConfigApply diff --git a/internal/task/task.go b/internal/task/task.go index 666a07e..ab4e171 100644 --- a/internal/task/task.go +++ b/internal/task/task.go @@ -207,7 +207,6 @@ var registry = map[string]taskDeserializer{ sidecar.TaskTypeConfigPatch: sidecarTask[ConfigPatchTask](false), sidecar.TaskTypeConfigValidate: sidecarTask[sidecar.ConfigValidateTask](true), sidecar.TaskTypeConfigureGenesis: sidecarTask[sidecar.ConfigureGenesisTask](false), - sidecar.TaskTypeDiscoverPeers: sidecarTask[sidecar.DiscoverPeersTask](false), sidecar.TaskTypeRestartSeid: sidecarTask[sidecar.RestartSeidTask](false), sidecar.TaskTypeMarkReady: sidecarTask[sidecar.MarkReadyTask](true), sidecar.TaskTypeSnapshotUpload: sidecarTask[sidecar.SnapshotUploadTask](true),