Readers of mesh-contracts' regenerated seats take the form
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
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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"})
|
||||
|
||||
Reference in New Issue
Block a user