diff --git a/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client_test.go index 4086eefe..adb3af7b 100644 --- a/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client_test.go @@ -107,4 +107,10 @@ func TestTheAsksAndOwedActsKeepTheirFormsAndRules(t *testing.T) { if acts, want := def.Defs["Owed"].Properties["act"].Enum, []string{"status", "view", "comment", "note"}; !reflect.DeepEqual(acts, want) { t.Errorf("the owed acts are %v, want %v", acts, want) } + // H-A-95 (2): the fields kept for a merge go with the act. + for _, field := range []string{"ask", "group"} { + if _, ok := def.Defs["Owed"].Properties[field]; ok { + t.Errorf("an owed act still has the field %s, kept only for a merge", field) + } + } } diff --git a/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go b/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go index d393057a..90390053 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go @@ -232,16 +232,12 @@ type Fill struct { type Owed struct { // the act: status, view, comment or note Act string `json:"act"` - // the operator's ask that approved the heads, for a merge - Ask string `json:"ask,omitempty"` // the commit a status or a note line is on; the head when absent Commit string `json:"commit,omitempty"` // a status: its context, such as mesh/merge-gate Context string `json:"context,omitempty"` // a status: what it says Description string `json:"description,omitempty"` - // the delivery group the pull request is a member of, for a merge - Group string `json:"group,omitempty"` // the pull request's head the act is for Head string `json:"head"` // the act's id, the same each time it is said again; a comment and a note line carry it, so the forge holds it once diff --git a/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json b/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json index 744014a5..015f9657 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json +++ b/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json @@ -574,14 +574,6 @@ "description": "the pull request's head the act is for", "pattern": "^[0-9a-f]{40}$" }, - "group": { - "type": "string", - "description": "the delivery group the pull request is a member of, for a merge" - }, - "ask": { - "type": "string", - "description": "the operator's ask that approved the heads, for a merge" - }, "commit": { "type": "string", "description": "the commit a status or a note line is on; the head when absent", diff --git a/modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.d.ts index 6131f639..242866c4 100644 --- a/modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.d.ts +++ b/modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.d.ts @@ -92,16 +92,12 @@ export interface Fill { export interface Owed { /** the act: status, view, comment or note */ "act": "status" | "view" | "comment" | "note"; - /** the operator's ask that approved the heads, for a merge */ - "ask"?: string; /** the commit a status or a note line is on; the head when absent */ "commit"?: string; /** a status: its context, such as mesh/merge-gate */ "context"?: string; /** a status: what it says */ "description"?: string; - /** the delivery group the pull request is a member of, for a merge */ - "group"?: string; /** the pull request's head the act is for */ "head": string; /** the act's id, the same each time it is said again; a comment and a note line carry it, so the forge holds it once */