diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon index ef7125b6e..c4a5ff0ae 100644 --- a/pkg/arvo/sys/vane/ames.hoon +++ b/pkg/arvo/sys/vane/ames.hoon @@ -954,7 +954,8 @@ :: ++ take |= [=wire =duct dud=(unit goof) type=* =sign] - ?< ?=(^ dud) + ?^ dud + ~|(%ames-larval-take-dud (mean tang.u.dud)) :: enqueue event if not a larval drainage timer :: :: XX what to do with errors? @@ -1103,7 +1104,9 @@ ++ take |= [=wire =duct dud=(unit goof) type=* =sign] ^- [(list move) _ames-gate] - ?< ?=(^ dud) + ?^ dud + ~|(%ames-take-dud (mean tang.u.dud)) + :: :: =/ event-core (per-event [our now eny scry-gate] duct ames-state) :: diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon index 172721b49..c4b51d557 100644 --- a/pkg/arvo/sys/vane/behn.hoon +++ b/pkg/arvo/sys/vane/behn.hoon @@ -298,7 +298,9 @@ ++ take |= [tea=wire hen=duct dud=(unit goof) hin=(hypo sign)] ^- [(list move) _behn-gate] - ?< ?=(^ dud) + ?^ dud + ~|(%behn-take-dud (mean tang.u.dud)) + :: ?> ?=([%drip @ ~] tea) =/ event-core (per-event [our now hen] state) =^ moves state diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 58bee6b1a..e2ed1b13d 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -4409,7 +4409,9 @@ ++ take :: accept response |= [tea=wire hen=duct dud=(unit goof) hin=(hypo sign)] ^+ [*(list move) ..^$] - ?< ?=(^ dud) + ?^ dud + ~|(%clay-take-dud (mean tang.u.dud)) + :: ?: ?=([%commit @ *] tea) =* syd i.t.tea =^ mos ruf diff --git a/pkg/arvo/sys/vane/dill.hoon b/pkg/arvo/sys/vane/dill.hoon index 5e06bbd31..07de324b3 100644 --- a/pkg/arvo/sys/vane/dill.hoon +++ b/pkg/arvo/sys/vane/dill.hoon @@ -632,7 +632,9 @@ ++ take :: process move |= {tea/wire hen/duct dud/(unit goof) hin/(hypo sign)} ^+ [*(list move) ..^$] - ?< ?=(^ dud) + ?^ dud + ~|(%dill-take-dud (mean tang.u.dud)) + :: =/ nus (ax hen) ?~ nus :: :hen is an unrecognized duct diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon index 1e3ac7c12..9cdf3b305 100644 --- a/pkg/arvo/sys/vane/eyre.hoon +++ b/pkg/arvo/sys/vane/eyre.hoon @@ -2176,7 +2176,8 @@ ++ take |= [=wire =duct dud=(unit goof) wrapped-sign=(hypo sign)] ^- [(list move) _http-server-gate] - ?< ?=(^ dud) + ?^ dud + ~|(%eyre-take-dud (mean tang.u.dud)) :: unwrap :sign, ignoring unneeded +type in :p.wrapped-sign :: =/ =sign q.wrapped-sign diff --git a/pkg/arvo/sys/vane/ford.hoon b/pkg/arvo/sys/vane/ford.hoon index e6cf36646..486eb716e 100644 --- a/pkg/arvo/sys/vane/ford.hoon +++ b/pkg/arvo/sys/vane/ford.hoon @@ -6131,7 +6131,8 @@ ++ call |= [=duct dud=(unit goof) type=* wrapped-task=(hobo task:able)] ^- [(list move) _ford-gate] - ?< ?=(^ dud) + ?^ dud + ~|(%ford-call-dud (mean tang.u.dud)) :: =/ task=task:able ((harden task:able) wrapped-task) :: we wrap +per-event with a call that binds our event args @@ -6245,7 +6246,8 @@ ++ take |= [=wire =duct dud=(unit goof) wrapped-sign=(hypo sign)] ^- [(list move) _ford-gate] - ?< ?=(^ dud) + ?^ dud + ~|(%ford-take-dud (mean tang.u.dud)) :: unwrap :sign, ignoring unneeded +type in :p.wrapped-sign :: =/ =sign q.wrapped-sign diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon index 2bb7f8a7e..927f25510 100644 --- a/pkg/arvo/sys/vane/gall.hoon +++ b/pkg/arvo/sys/vane/gall.hoon @@ -1480,7 +1480,8 @@ ~% %gall-call +> ~ |= [=duct dud=(unit goof) hic=(hypo (hobo task:able))] ^- [(list move) _gall-payload] - ?< ?=(^ dud) + ?^ dud + ~|(%gall-call-dud (mean tang.u.dud)) :: ~| [%gall-call-failed duct q.hic] =/ =task:able ((harden task:able) q.hic) @@ -1988,7 +1989,8 @@ ~/ %gall-take |= [=wire =duct dud=(unit goof) hin=(hypo sign-arvo)] ^- [(list move) _gall-payload] - ?< ?=(^ dud) + ?^ dud + ~|(%gall-take-dud (mean tang.u.dud)) :: ~| [%gall-take-failed wire] :: diff --git a/pkg/arvo/sys/vane/jael.hoon b/pkg/arvo/sys/vane/jael.hoon index 8b6a97303..a862b41af 100644 --- a/pkg/arvo/sys/vane/jael.hoon +++ b/pkg/arvo/sys/vane/jael.hoon @@ -969,7 +969,9 @@ hic/(hypo (hobo task:able)) == ^- [(list move) _..^$] - ?< ?=(^ dud) + ?^ dud + ~|(%jael-call-dud (mean tang.u.dud)) + :: =/ =task:able ((harden task:able) q.hic) =^ did lex abet:(~(call of [our now eny] lex) hen task) @@ -1200,7 +1202,9 @@ hin/(hypo sign) == ^- [(list move) _..^$] - ?< ?=(^ dud) + ?^ dud + ~|(%jael-take-dud (mean tang.u.dud)) + :: =^ did lex abet:(~(take of [our now eny] lex) tea hen q.hin) [did ..^$] --