Join item 1: the catalogue's modules take the router's ask from operator-channel's contract and client
mesh-sdk holds neither asks nor asker, nor the vault's answer types, and mesh-delivery's sdk/views is mesh-sdk's go/views (a1-progress.md, the rewrite map for the join): thirteen modules switch to the operatorchannel contract and client, mesh-sdk's channel package and meshvault, with go.mod requiring each at the group pin (nats: meshbroker too). The gate holds the checks mesh-sdk dropped (an ask's id is its key's asking, at least one option), with a row that fails without them; claude-code refuses a router record whose times do not parse, as its JSON decode did, with a row. Claude-Session: https://claude.ai/code/session_01JG73KJNrH5EgFXMKKYSrig
This commit is contained in:
@@ -13,8 +13,9 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
occ "git.novox.be/novox/mesh-contracts/go/clients/operatorchannelclient"
|
||||
oc "git.novox.be/novox/mesh-contracts/go/seats/operatorchannel"
|
||||
stdio "git.novox.be/novox/mesh-sdk/go"
|
||||
"git.novox.be/novox/mesh-sdk/go/asks"
|
||||
)
|
||||
|
||||
// memProposals is the `proposals` state, shared by every node of a test as the bus shares it.
|
||||
@@ -46,7 +47,7 @@ func (s *memProposals) Get(key string) (json.RawMessage, bool, error) {
|
||||
// router is the operator channel's holder as the module reaches it: what was asked, its record of each ask, and
|
||||
// the channel kinds.
|
||||
type router struct {
|
||||
published map[string]asks.Ask
|
||||
published map[string]oc.Ask
|
||||
subjects []string
|
||||
records map[string]json.RawMessage
|
||||
kinds []stdio.KindHeld
|
||||
@@ -54,7 +55,7 @@ type router struct {
|
||||
}
|
||||
|
||||
func newRouter() *router {
|
||||
return &router{published: map[string]asks.Ask{}, records: map[string]json.RawMessage{},
|
||||
return &router{published: map[string]oc.Ask{}, records: map[string]json.RawMessage{},
|
||||
kinds: []stdio.KindHeld{{Seat: "channel", Kind: "telegram", Module: "telegram", Node: "novox",
|
||||
Capabilities: []string{"choice", "exact-render", "verified-sender"}}}}
|
||||
}
|
||||
@@ -65,7 +66,7 @@ func (r *router) Publish(subject string, body any, id string) error {
|
||||
}
|
||||
r.subjects = append(r.subjects, subject)
|
||||
raw, _ := json.Marshal(body)
|
||||
var a asks.Ask
|
||||
var a oc.Ask
|
||||
_ = json.Unmarshal(raw, &a)
|
||||
r.published[a.ID] = a
|
||||
r.records[a.ID], _ = json.Marshal(map[string]any{"state": "open"})
|
||||
@@ -81,19 +82,19 @@ func (r *router) Record(id string) (*stdio.StateEntry, error) {
|
||||
func (r *router) Kinds() ([]stdio.KindHeld, error) { return r.kinds, nil }
|
||||
|
||||
// close ends an ask with a warrant, as the router records it.
|
||||
func (r *router) close(w asks.Warrant) {
|
||||
func (r *router) close(w oc.Warrant) {
|
||||
w.Asker = Module
|
||||
state := string(w.Outcome)
|
||||
r.records[w.Ask], _ = json.Marshal(map[string]any{"state": state, "warrant": w})
|
||||
}
|
||||
|
||||
// chose is the warrant for a person's choice of an option of the ask as the router took it.
|
||||
func (r *router) chose(id, option string, at time.Time) asks.Warrant {
|
||||
func (r *router) chose(id, option string, at time.Time) oc.Warrant {
|
||||
a := r.published[id]
|
||||
o, _ := a.Option(option)
|
||||
return asks.Warrant{Ask: id, Asker: Module, Outcome: asks.OutcomeChosen, Option: o.ID, Label: o.Label, Level: o.Level,
|
||||
By: &asks.Person{Who: asks.Operator, Kind: "telegram", Identity: "42", Verified: "user id verified"},
|
||||
Channel: "telegram", Proofs: []string{"P1"}, At: at, AskDigest: a.Digest()}
|
||||
o, _ := occ.OptionOf(a, option)
|
||||
return oc.Warrant{Ask: id, Asker: Module, Outcome: occ.OutcomeChosen, Option: o.ID, Label: o.Label, Level: o.Level,
|
||||
By: &oc.Person{Who: occ.Operator, Kind: "telegram", Identity: "42", Verified: "user id verified"},
|
||||
Channel: "telegram", Proofs: []string{"P1"}, At: occ.FormatTime(at), AskDigest: occ.Digest(a)}
|
||||
}
|
||||
|
||||
type recorded struct{ asks []string }
|
||||
@@ -144,13 +145,13 @@ func TestAProposalAsksTheOperatorAtTheLevelApproveAndChangesNothing(t *testing.T
|
||||
t.Fatalf("the ask was published on %v, not under this module's own name", r.subjects)
|
||||
}
|
||||
a := r.published[id]
|
||||
if err := a.Check(t0); err != nil {
|
||||
if err := occ.Check(a, t0); err != nil {
|
||||
t.Fatalf("the router would refuse the ask: %v", err)
|
||||
}
|
||||
// At a glance (issue 639): what it does is the explanation, one line; the text is the Details, which the
|
||||
// router notes collapsed after the answers.
|
||||
if a.Explanation != "Every Claude session on the mesh reads these 4 lines as the mesh's own word, from its next start until they are removed the same way." ||
|
||||
asks.Glance(a.Explanation) != nil {
|
||||
occ.Glance(a.Explanation) != nil {
|
||||
t.Errorf("the phone does not say what is asked at a glance: %q", a.Explanation)
|
||||
}
|
||||
if a.Headline != "Add Claude instructions 'handoff-from-g14'?" {
|
||||
@@ -163,11 +164,11 @@ func TestAProposalAsksTheOperatorAtTheLevelApproveAndChangesNothing(t *testing.T
|
||||
t.Fatalf("options: %+v", a.Options)
|
||||
}
|
||||
for _, o := range a.Options {
|
||||
if o.Level != asks.Approve || !strings.HasPrefix(o.Binds, "sha256:") {
|
||||
if o.Level != occ.Approve || !strings.HasPrefix(o.Binds, "sha256:") {
|
||||
t.Errorf("the option %s is %s binding %q: both answers need a proven sender and bind the act", o.ID, o.Level, o.Binds)
|
||||
}
|
||||
}
|
||||
if !a.Expires.Equal(t0.Add(ProposalLasts)) {
|
||||
if a.Expires != occ.FormatTime(t0.Add(ProposalLasts)) {
|
||||
t.Errorf("expires %s", a.Expires)
|
||||
}
|
||||
// Nothing is active, here or anywhere, while the ask is open.
|
||||
@@ -212,10 +213,10 @@ func TestNothingBecomesActiveWithoutAValidWarrant(t *testing.T) {
|
||||
}{
|
||||
{"declined", func(r *router, _ *memProposals, id string) { r.close(r.chose(id, OptionDecline, t0.Add(time.Hour))) }, "declined"},
|
||||
{"expired", func(r *router, _ *memProposals, id string) {
|
||||
r.close(asks.Warrant{Ask: id, Outcome: asks.OutcomeExpired, At: t0.Add(24 * time.Hour)})
|
||||
r.close(oc.Warrant{Ask: id, Outcome: occ.OutcomeExpired, At: occ.FormatTime(t0.Add(24 * time.Hour))})
|
||||
}, "discarded"},
|
||||
{"refused by the router", func(r *router, _ *memProposals, id string) {
|
||||
r.close(asks.Warrant{Ask: id, Outcome: asks.OutcomeRefused, Words: "no channel can carry it", At: t0})
|
||||
r.close(oc.Warrant{Ask: id, Outcome: occ.OutcomeRefused, Words: "no channel can carry it", At: occ.FormatTime(t0)})
|
||||
}, "discarded"},
|
||||
{"the text changed after the ask, with its digest", func(r *router, store *memProposals, id string) {
|
||||
var prop Proposal
|
||||
@@ -243,7 +244,7 @@ func TestNothingBecomesActiveWithoutAValidWarrant(t *testing.T) {
|
||||
}, "refused"},
|
||||
{"answered at the level acknowledge", func(r *router, _ *memProposals, id string) {
|
||||
w := r.chose(id, OptionApprove, t0.Add(time.Hour))
|
||||
w.Level = asks.Acknowledge
|
||||
w.Level = occ.Acknowledge
|
||||
r.close(w)
|
||||
}, "refused"},
|
||||
{"no person chose", func(r *router, _ *memProposals, id string) {
|
||||
@@ -428,7 +429,7 @@ func TestALongTextIsShownInPartAndReadWholeAtTheTerminal(t *testing.T) {
|
||||
!strings.Contains(a.Details, "fingerprint "+out["fingerprint"].(string)) {
|
||||
t.Errorf("the phone does not say where to read all of it: %q", a.Details)
|
||||
}
|
||||
if len(a.Details) > 3000 || asks.Glance(a.Explanation) != nil {
|
||||
if len(a.Details) > 3000 || occ.Glance(a.Explanation) != nil {
|
||||
t.Errorf("the details are %d bytes; the explanation %q", len(a.Details), a.Explanation)
|
||||
}
|
||||
list, err := ListProposals(p, store, r, id, t0)
|
||||
@@ -496,7 +497,7 @@ func TestATextChangedPastWhatThePhoneShowsIsRefused(t *testing.T) {
|
||||
_ = json.Unmarshal(store.m[id], &prop)
|
||||
prop.Text = strings.Replace(prop.Text, "Ask before you push.", "Push without asking.", 1)
|
||||
_ = store.Put(id, prop)
|
||||
if prop.Ask().Digest() != r.published[id].Digest() {
|
||||
if occ.Digest(prop.Ask()) != occ.Digest(r.published[id]) {
|
||||
t.Fatal("the test means a change the ask's words do not show")
|
||||
}
|
||||
r.close(r.chose(id, OptionApprove, t0.Add(time.Hour)))
|
||||
@@ -559,7 +560,7 @@ func TestAForgedRecordIsNotAppliedEvenWhenApproved(t *testing.T) {
|
||||
} {
|
||||
prop.Digest = textDigest(prop.Text)
|
||||
_ = store.Put(prop.ID, prop)
|
||||
if err := r.Publish(asks.AskSubject(Module), prop.Ask(), prop.ID); err != nil {
|
||||
if err := r.Publish(oc.AcceptSubjectAsk(Module), prop.Ask(), prop.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
r.close(r.chose(prop.ID, OptionApprove, t0.Add(time.Hour)))
|
||||
@@ -718,8 +719,8 @@ func (r *refusingRouter) Publish(subject string, body any, id string) error {
|
||||
r.id = id
|
||||
go func() {
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
_, _ = HeardEnd(r.p, r.store, asks.Warrant{Ask: id, Asker: Module, Outcome: asks.OutcomeRefused,
|
||||
Words: "no channel can carry any of its answers now: telegram is not linked", At: t0}, t0)
|
||||
_, _ = HeardEnd(r.p, r.store, oc.Warrant{Ask: id, Asker: Module, Outcome: occ.OutcomeRefused,
|
||||
Words: "no channel can carry any of its answers now: telegram is not linked", At: occ.FormatTime(t0)}, t0)
|
||||
}()
|
||||
return nil
|
||||
}
|
||||
@@ -729,12 +730,23 @@ func TestAnAskTakenAfterItsRefusalIsStillAnswered(t *testing.T) {
|
||||
p, _ := node(t, "novox")
|
||||
store, r := &memProposals{m: map[string]json.RawMessage{}}, newRouter()
|
||||
id := proposeHandover(t, p, store, r)
|
||||
if _, err := HeardEnd(p, store, asks.Warrant{Ask: id, Asker: Module, Outcome: asks.OutcomeRefused, Words: "no channel", At: t0}, t0); err != nil {
|
||||
if _, err := HeardEnd(p, store, oc.Warrant{Ask: id, Asker: Module, Outcome: occ.OutcomeRefused, Words: "no channel", At: occ.FormatTime(t0)}, t0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := outcomeHere(t, p, id); !strings.HasPrefix(got, "discarded") {
|
||||
t.Fatalf("decided %q", got)
|
||||
}
|
||||
// A warrant whose time does not parse is refused, naming the field, as the decode of it was.
|
||||
bad := r.chose(id, OptionApprove, t0.Add(time.Hour))
|
||||
bad.At = "yesterday"
|
||||
prop, _ := readProposal(store, id)
|
||||
appr := Approved{Decided: map[string]ProposalDecision{}, Changed: map[string]time.Time{}, Refused: map[string]string{}}
|
||||
if d, _, _, _ := decide(p, &appr, prop, bad, t0.Add(time.Hour)); !strings.HasPrefix(d.Outcome, "refused: the warrant's at") {
|
||||
t.Errorf("a warrant with a malformed at was decided %q", d.Outcome)
|
||||
}
|
||||
if (routerRecord{Warrant: &bad}).check() == nil {
|
||||
t.Error("a router record with a malformed at passed its check")
|
||||
}
|
||||
r.close(r.chose(id, OptionApprove, t0.Add(time.Hour)))
|
||||
if changed, _, _ := Reconcile(p, store, r, nil, t0.Add(time.Hour)); !changed {
|
||||
t.Fatal("the approval of an ask taken after its refusal was lost")
|
||||
@@ -769,7 +781,7 @@ func TestAProposalIsAskedAtAGlanceAndAnOlderOneAsItWasAsked(t *testing.T) {
|
||||
older := prop
|
||||
older.Form = 0
|
||||
listed := older.Ask()
|
||||
if !strings.Contains(listed.Explanation, "The whole text:") || listed.Details != "" || listed.Digest() == prop.Ask().Digest() {
|
||||
if !strings.Contains(listed.Explanation, "The whole text:") || listed.Details != "" || occ.Digest(listed) == occ.Digest(prop.Ask()) {
|
||||
t.Errorf("a proposal made before is not composed as it was asked: %q", listed.Explanation)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user