From c1ec75789f7080d8165453fdc65f907b5915231b Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 21 Nov 2026 23:15:31 +0100 Subject: [PATCH] Readers of mesh-contracts' regenerated seats take the form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The node enroller's and the watchdogs' generated decoders answer the form they read (mesh-contracts K1); their readers here take it. Builds: design 47 H2 ยง780 --- .../mesh-delivery-assigner/internal/assignment/candidate.go | 2 +- .../mesh-delivery-assigner/internal/assignment/proposal.go | 2 +- modules/mesh-delivery-builder/buildrun/presence.go | 2 +- .../cmd/mesh-delivery-watchman-tools/main.go | 2 +- modules/mesh-enrolment/cmd/mesh-enrolment/end_test.go | 2 +- modules/mesh-enrolment/cmd/mesh-enrolment/state.go | 4 ++-- modules/mesh-grants/internal/grants/inputs.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/mesh-delivery-assigner/internal/assignment/candidate.go b/modules/mesh-delivery-assigner/internal/assignment/candidate.go index 33e5f03c0..93d69d33f 100644 --- a/modules/mesh-delivery-assigner/internal/assignment/candidate.go +++ b/modules/mesh-delivery-assigner/internal/assignment/candidate.go @@ -66,7 +66,7 @@ func DecodeCandidate(data []byte) (seat.CandidatesByProposalNodeValue, error) { if err := keys.CheckVersion(data); err != nil { return seat.CandidatesByProposalNodeValue{}, err } - c, err := seat.DecodeCandidatesByProposalNodeValue(data) + c, _, err := seat.DecodeCandidatesByProposalNodeValue(data) if err != nil { return seat.CandidatesByProposalNodeValue{}, fmt.Errorf("assignments: a candidate does not fit its shape: %w", err) } diff --git a/modules/mesh-delivery-assigner/internal/assignment/proposal.go b/modules/mesh-delivery-assigner/internal/assignment/proposal.go index 1680e5983..c36155489 100644 --- a/modules/mesh-delivery-assigner/internal/assignment/proposal.go +++ b/modules/mesh-delivery-assigner/internal/assignment/proposal.go @@ -428,7 +428,7 @@ func DecodeProposal(data []byte) (seat.Proposal, error) { if err := keys.CheckVersion(data); err != nil { return seat.Proposal{}, err } - p, err := seat.DecodeProposalsByProposalValue(data) + p, _, err := seat.DecodeProposalsByProposalValue(data) if err != nil { return seat.Proposal{}, fmt.Errorf("assignments: a proposal does not fit its shape: %w", err) } diff --git a/modules/mesh-delivery-builder/buildrun/presence.go b/modules/mesh-delivery-builder/buildrun/presence.go index fafc431bb..edfe1515e 100644 --- a/modules/mesh-delivery-builder/buildrun/presence.go +++ b/modules/mesh-delivery-builder/buildrun/presence.go @@ -26,7 +26,7 @@ func (s *PresenceSet) Put(key string, value []byte, deleted bool) bool { } on := false if !deleted { - p, err := meshwatchdogs.DecodePresenceByNodeValue(value) + p, _, err := meshwatchdogs.DecodePresenceByNodeValue(value) if err != nil { return false } diff --git a/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman-tools/main.go b/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman-tools/main.go index a66d18d56..d3602e3b3 100644 --- a/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman-tools/main.go +++ b/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman-tools/main.go @@ -129,7 +129,7 @@ func presenceOf(st state, machine string) (any, error) { if e == nil { return answer, nil } - v, err := meshwatchdogs.DecodePresenceByNodeValue(e.Value) + v, _, err := meshwatchdogs.DecodePresenceByNodeValue(e.Value) if err != nil { return nil, fmt.Errorf("presence %s does not read: %w", machine, err) } diff --git a/modules/mesh-enrolment/cmd/mesh-enrolment/end_test.go b/modules/mesh-enrolment/cmd/mesh-enrolment/end_test.go index 7b3492cdb..42639feac 100644 --- a/modules/mesh-enrolment/cmd/mesh-enrolment/end_test.go +++ b/modules/mesh-enrolment/cmd/mesh-enrolment/end_test.go @@ -217,7 +217,7 @@ func theDropFollowsOnlyAnEndAndNothingHoldsTheToken(t *testing.T) { type expired struct{ Node, IssuedID string } func decodeExpired(raw []byte) (expired, error) { - c, err := meshnodeenroller.DecodeEnrolmentsByNodeNodeValue(raw) + c, _, err := meshnodeenroller.DecodeEnrolmentsByNodeNodeValue(raw) if err != nil || c.Issued == nil { return expired{}, fmt.Errorf("enrolment-expired is not the seat's enrolment with its issue time: %v", err) } diff --git a/modules/mesh-enrolment/cmd/mesh-enrolment/state.go b/modules/mesh-enrolment/cmd/mesh-enrolment/state.go index 70a3c83a1..3e2e8059a 100644 --- a/modules/mesh-enrolment/cmd/mesh-enrolment/state.go +++ b/modules/mesh-enrolment/cmd/mesh-enrolment/state.go @@ -109,7 +109,7 @@ func decodeEnrolment(raw []byte) (Enrolment, error) { if err := keys.CheckVersion(raw); err != nil { return Enrolment{}, err } - c, err := meshnodeenroller.DecodeEnrolmentsByNodeNodeValue(raw) + c, _, err := meshnodeenroller.DecodeEnrolmentsByNodeNodeValue(raw) if err != nil { return Enrolment{}, fmt.Errorf("the enrolment does not fit its shape: %w", err) } @@ -147,7 +147,7 @@ func decodeReservation(raw []byte) (Reservation, error) { if err := keys.CheckVersion(raw); err != nil { return Reservation{}, err } - c, err := meshnodeenroller.DecodeEnrolmentsByAddressAddressValue(raw) + c, _, err := meshnodeenroller.DecodeEnrolmentsByAddressAddressValue(raw) if err != nil { return Reservation{}, fmt.Errorf("the reservation does not fit its shape: %w", err) } diff --git a/modules/mesh-grants/internal/grants/inputs.go b/modules/mesh-grants/internal/grants/inputs.go index 80a0a0c6a..0f1ecdd04 100644 --- a/modules/mesh-grants/internal/grants/inputs.go +++ b/modules/mesh-grants/internal/grants/inputs.go @@ -680,7 +680,7 @@ func readEnrolling(r Reader, gaps *[]Gap) ([]string, bool) { if !found { continue } - e, err := meshnodeenroller.DecodeEnrolmentsByNodeNodeValue(raw) + e, _, err := meshnodeenroller.DecodeEnrolmentsByNodeNodeValue(raw) if err != nil || e.Node != node { *gaps = append(*gaps, Gap{Input: ReadEnrolments + " " + k, Why: "does not read as the enrolment of " + node + ", so it composes no user"})