diff --git a/pkg/arvo/app/chat-hook.hoon b/pkg/arvo/app/chat-hook.hoon index be524ad06..ff32f71d2 100644 --- a/pkg/arvo/app/chat-hook.hoon +++ b/pkg/arvo/app/chat-hook.hoon @@ -370,7 +370,7 @@ =/ nack-count=@ud (slav %ud i.t.wire) =/ who=@p (slav %p i.t.t.wire) =/ pax t.t.t.wire - ?> ?=([%b %wake *] sign-arvo) + ?> ?=([%behns %wake *] sign-arvo) ~? ?=(^ error.sign-arvo) "behn errored in backoff timers, continuing anyway" :_ this diff --git a/pkg/arvo/app/contact-hook.hoon b/pkg/arvo/app/contact-hook.hoon index 2e5a7ca4d..101e39ad4 100644 --- a/pkg/arvo/app/contact-hook.hoon +++ b/pkg/arvo/app/contact-hook.hoon @@ -195,7 +195,7 @@ =/ nack-count=@ud (slav %ud i.t.wire) =/ who=@p (slav %p i.t.t.wire) =/ pax t.t.t.wire - ?> ?=([%b %wake *] sign-arvo) + ?> ?=([%behn %wake *] sign-arvo) ~? ?=(^ error.sign-arvo) "behn errored in backoff timers, continuing anyway" :_ this diff --git a/pkg/arvo/app/dbug.hoon b/pkg/arvo/app/dbug.hoon index 59e350079..f7132f05f 100644 --- a/pkg/arvo/app/dbug.hoon +++ b/pkg/arvo/app/dbug.hoon @@ -66,7 +66,7 @@ ++ on-arvo |= [=wire =sign-arvo] ^- (quip card _this) - ?. ?=([%e %bound *] sign-arvo) + ?. ?=([%eyre %bound *] sign-arvo) (on-arvo:def wire sign-arvo) ~? !accepted.sign-arvo [dap.bowl "bind rejected!" binding.sign-arvo] diff --git a/pkg/arvo/app/graph-store.hoon b/pkg/arvo/app/graph-store.hoon index 1885aae07..611526856 100644 --- a/pkg/arvo/app/graph-store.hoon +++ b/pkg/arvo/app/graph-store.hoon @@ -946,7 +946,7 @@ [%try-rejoin @ *] =/ rid=resource:store (de-path:res t.t.wire) =/ nack-count (slav %ud i.t.wire) - ?> ?=([%b %wake *] sign-arvo) + ?> ?=([%behn %wake *] sign-arvo) ~? ?=(^ error.sign-arvo) "behn errored in backoff timers, continuing anyway" =/ new=^wire [%try-rejoin (scot %ud +(nack-count)) t.t.wire] diff --git a/pkg/arvo/app/group-store.hoon b/pkg/arvo/app/group-store.hoon index b5d42124e..2f601728c 100644 --- a/pkg/arvo/app/group-store.hoon +++ b/pkg/arvo/app/group-store.hoon @@ -244,7 +244,7 @@ (on-arvo:def wire sign-arvo) =/ =resource (de-path:resource t.t.wire) =/ nack-count=@ud (slav %ud i.t.wire) - ?> ?=([%b %wake *] sign-arvo) + ?> ?=([%behn %wake *] sign-arvo) ~? ?=(^ error.sign-arvo) "behn errored in backoff timers, continuing anyway" :_ this diff --git a/pkg/arvo/app/hark-store.hoon b/pkg/arvo/app/hark-store.hoon index fc1894f0f..89cb3b900 100644 --- a/pkg/arvo/app/hark-store.hoon +++ b/pkg/arvo/app/hark-store.hoon @@ -258,7 +258,7 @@ ^- (quip card _this) ?. ?=([%autoseen ~] wire) (on-arvo:def wire sign-arvo) - ?> ?=([%b %wake *] sign-arvo) + ?> ?=([%behn %wake *] sign-arvo) :_ this(last-seen now.bowl) ~[autoseen-timer:ha] :: diff --git a/pkg/arvo/app/herm.hoon b/pkg/arvo/app/herm.hoon index 4434685c3..ba539aadf 100644 --- a/pkg/arvo/app/herm.hoon +++ b/pkg/arvo/app/herm.hoon @@ -65,7 +65,7 @@ :: pass on dill blits for the session :: [%view %$ ~] - ?. ?=([%d %blit *] sign-arvo) + ?. ?=([%dill %blit *] sign-arvo) ~| [%unexpected-sign [- +<]:sign-arvo] !! :_ this @@ -78,7 +78,7 @@ [%tube @ @ ~] =* from i.t.wire =* to i.t.t.wire - ?. ?=([%c %writ *] sign-arvo) + ?. ?=([%clay %writ *] sign-arvo) ~| [%unexpected-sign [- +<]:sign-arvo] !! :_ this diff --git a/pkg/arvo/app/language-server.hoon b/pkg/arvo/app/language-server.hoon index 9785036b0..e0b5e37d6 100644 --- a/pkg/arvo/app/language-server.hoon +++ b/pkg/arvo/app/language-server.hoon @@ -100,8 +100,8 @@ ^- (quip card _this) =^ cards state ?+ sign-arvo (on-arvo:def wire sign-arvo) - [%e %bound *] `state - [%c *] (handle-build:lsp wire +.sign-arvo) + [%eyre %bound *] `state + [%clay *] (handle-build:lsp wire +.sign-arvo) == [cards this] :: diff --git a/pkg/arvo/app/metadata-hook.hoon b/pkg/arvo/app/metadata-hook.hoon index 39f3b3c91..43db8695b 100644 --- a/pkg/arvo/app/metadata-hook.hoon +++ b/pkg/arvo/app/metadata-hook.hoon @@ -67,7 +67,7 @@ =/ nack-count=@ud (slav %ud i.t.wire) =/ who=@p (slav %p i.t.t.wire) =/ pax t.t.t.wire - ?> ?=([%b %wake *] sign-arvo) + ?> ?=([%behn %wake *] sign-arvo) ~? ?=(^ error.sign-arvo) "behn errored in backoff timers, continuing anyway" :_ this diff --git a/pkg/arvo/app/spider.hoon b/pkg/arvo/app/spider.hoon index bb3c360e6..4da3089c1 100644 --- a/pkg/arvo/app/spider.hoon +++ b/pkg/arvo/app/spider.hoon @@ -362,7 +362,7 @@ =. starting.state (~(jab by starting.state) yarn |=([=trying =vase] [%none vase])) ~| sign+[- +<]:sign-arvo - ?> ?=([?(%b %c) %writ *] sign-arvo) + ?> ?=([?(%behn %clay) %writ *] sign-arvo) =/ =riot:clay p.sign-arvo ?~ riot (thread-fail-not-running tid %build-thread-error *tang) diff --git a/pkg/arvo/lib/strandio.hoon b/pkg/arvo/lib/strandio.hoon index 07745b642..6781630ad 100644 --- a/pkg/arvo/lib/strandio.hoon +++ b/pkg/arvo/lib/strandio.hoon @@ -173,7 +173,7 @@ |= tin=strand-input:strand ?+ in.tin `[%skip ~] ~ `[%wait ~] - [~ %sign [%wait @ ~] %b %wake *] + [~ %sign [%wait @ ~] %behn %wake *] ?. |(?=(~ until) =(`u.until (slaw %da i.t.wire.u.in.tin))) `[%skip ~] ?~ error.sign-arvo.u.in.tin @@ -340,7 +340,7 @@ ;< ~ bind:m (send-raw-card card) |= tin=strand-input:strand =* loop $ - ?: ?& ?=([~ %sign [%timeout @ ~] %b %wake *] in.tin) + ?: ?& ?=([~ %sign [%timeout @ ~] %behn %wake *] in.tin) =((scot %da when) i.t.wire.u.in.tin) == `[%fail %timeout ~] @@ -370,7 +370,7 @@ |= tin=strand-input:strand ?+ in.tin `[%skip ~] ~ `[%wait ~] - [~ %sign [%request ~] %i %http-response %finished *] + [~ %sign [%request ~] %iris %http-response %finished *] `[%done client-response.sign-arvo.u.in.tin] == :: @@ -395,9 +395,9 @@ |= tin=strand-input:strand ?+ in.tin `[%skip ~] ~ `[%wait ~] - [~ %sign [%request ~] %i %http-response %cancel *] + [~ %sign [%request ~] %iris %http-response %cancel *] `[%done ~] - [~ %sign [%request ~] %i %http-response %finished *] + [~ %sign [%request ~] %iris %http-response %finished *] `[%done `client-response.sign-arvo.u.in.tin] == :: @@ -516,7 +516,7 @@ |= tin=strand-input:strand ?+ in.tin `[%skip ~] ~ `[%wait ~] - [~ %sign * ?(%b %c) %writ *] + [~ %sign * ?(%behn %clay) %writ *] ?. =(wire wire.u.in.tin) `[%skip ~] `[%done +>.sign-arvo.u.in.tin] diff --git a/pkg/arvo/sys/arvo.hoon b/pkg/arvo/sys/arvo.hoon index 265fe1267..070386c36 100644 --- a/pkg/arvo/sys/arvo.hoon +++ b/pkg/arvo/sys/arvo.hoon @@ -1008,9 +1008,9 @@ ++ smit |= [cap=tape sub=vase pax=path txt=@t] ^- vase - ~> %slog.[0 leaf+"{cap}: {(scow p+(mug txt))}"] + ~> %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"] %- road |. - ~_ leaf/cap + ~_ leaf/"{cap}: build failed" (slap sub (rain pax txt)) :: ++ create @@ -1252,7 +1252,7 @@ :: ~? !lac.fad :- (runt [(lent bars.gem) '|'] "") - [%slip vane.gem (symp +>-.task) duct] + [%slip [vane.gem vane] (symp +>-.task) duct] :: (call duct vane task) :: @@ -1332,13 +1332,15 @@ ?. =(2 (met 3 vis)) [vis %$] [(end 3 vis) (rsh 3 vis)] - =. way (grow way) :: ?: ?=(%$ way) (peek:pith lyc car bem) - ?. (~(has by van.mod) way) + :: + =. way (grow way) + ?~ van=(~(get by van.mod) way) ~ - (peek:(plow way) lyc car bem) + %. [lyc car bem] + peek:spin:(~(plow va [vil u.van]) now peek) :: +call: advance to target :: ++ call @@ -1350,10 +1352,11 @@ ~> %mean.'call: bad waif' ;;(waif q.p.task) :: + =. way (grow way) %+ push [way duct bars.gem] ~| bar-stack=`(list ^duct)`[duct bars.gem] %. task - call:(spin:(plow (grow way)) duct eny dud) + call:(spin:(plow way) duct eny dud) :: +take: retreat along call-stack :: ++ take @@ -1365,9 +1368,9 @@ :: ?> ?=(~ duct) (xeno:pith wire ;;(card q.p.gift)) - :: :: the caller was a vane :: + =. way (grow way) %+ push [way duct bars.gem] :: :: cons source onto .gift to make a $sign @@ -1375,7 +1378,7 @@ ~| wire=wire ~| bar-stack=`(list ^duct)`[duct bars.gem] %. [wire [vane.gem gift]] - take:(spin:(plow (grow way)) duct eny dud) + take:(spin:(plow way) duct eny dud) :: +push: finalize an individual step :: ++ push @@ -1383,7 +1386,7 @@ ^+ this =^ moz sac (~(refine-moves me sac vil) zom) - =. van.mod (~(put by van.mod) (grow vane.gum) [vax sac]) + =. van.mod (~(put by van.mod) vane.gum [vax sac]) (emit `plan`[`germ`gum `(list move)`moz]) :: +plow: operate on a vane, in time and space :: @@ -1814,9 +1817,9 @@ ++ smit |= [cap=tape sub=(trap vase) pax=path txt=@t] ^- (trap vase) - ~> %slog.[0 leaf+"{cap}: {(scow p+(mug txt))}"] + ~> %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"] %- road |. - ~_ leaf/cap + ~_ leaf/"{cap}: build failed" (swat sub (rain pax txt)) -- :: diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon index fd5be3063..747527d9e 100644 --- a/pkg/arvo/sys/vane/ames.hoon +++ b/pkg/arvo/sys/vane/ames.hoon @@ -634,11 +634,11 @@ :: $sign: response from other vane :: +$ sign - $~ [%b %wake ~] - $% $: %b - $% [%wake error=(unit tang)] + $~ [%behn %wake ~] + $% $: %behn + $% $>(%wake gift:able:behn) == == - $: %j + $: %jael $% [%private-keys =life vein=(map life ring)] [%public-keys =public-keys-result] [%turf turfs=(list turf)] @@ -783,7 +783,7 @@ [~ larval-gate] :: larval event drainage timer; pop and process a queued event :: - ?. ?=([%b %wake *] sign) + ?. ?=([%behn %wake *] sign) ~> %slog.0^leaf/"ames: larva: strange sign" [~ larval-gate] :: if crashed, print, dequeue, and set next drainage timer @@ -916,11 +916,11 @@ [@ %done *] (on-take-done:event-core wire error.sign) [@ %boon *] (on-take-boon:event-core wire payload.sign) :: - [%b %wake *] (on-take-wake:event-core wire error.sign) + [%behn %wake *] (on-take-wake:event-core wire error.sign) :: - [%j %turf *] (on-take-turf:event-core turfs.sign) - [%j %private-keys *] (on-priv:event-core [life vein]:sign) - [%j %public-keys *] (on-publ:event-core wire public-keys-result.sign) + [%jael %turf *] (on-take-turf:event-core turfs.sign) + [%jael %private-keys *] (on-priv:event-core [life vein]:sign) + [%jael %public-keys *] (on-publ:event-core wire public-keys-result.sign) == :: [moves ames-gate] diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon index fc4d107c9..7a768e050 100644 --- a/pkg/arvo/sys/vane/behn.hoon +++ b/pkg/arvo/sys/vane/behn.hoon @@ -15,8 +15,8 @@ $>(%flog task:able:dill) :: log output == == :: +$ sign - $~ [%b %wake ~] - $% [%b $>(%wake gift:able)] + $~ [%behn %wake ~] + $% [%behn $>(%wake gift:able)] == :: +$ behn-state diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 8ec926a72..43cb8768a 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -318,26 +318,26 @@ == == :: +$ riot (unit rant) :: response+complete +$ sign :: in result $<- - $~ [%b %wake ~] :: - $% $: %a :: by %ames + $~ [%behn %wake ~] :: + $% $: %ames :: $> $? %boon :: response %done :: (n)ack %lost :: lost boon == :: gift:able:ames :: == :: - $: %b :: by %behn + $: %behn :: $% $>(%wake gift:able:behn) :: timer activate $>(%writ gift:able) :: XX %slip == == :: - $: %c :: by %clay + $: %clay :: $> $? %mere :: %note :: %writ :: == :: gift:able :: == :: - $: %j :: by %jael + $: %jael ::s $>(%public-keys gift:able:jael) :: == :: $: @tas :: by any diff --git a/pkg/arvo/sys/vane/dill.hoon b/pkg/arvo/sys/vane/dill.hoon index e7c481dc7..5852a957f 100644 --- a/pkg/arvo/sys/vane/dill.hoon +++ b/pkg/arvo/sys/vane/dill.hoon @@ -65,22 +65,22 @@ task:able:jael :: == == :: +$ sign :: in result $<- - $~ [%d %blit ~] :: - $% $: %b :: + $~ [%dill %blit ~] :: + $% $: %behn :: $% $>(%writ gift:able:clay) :: XX %slip $>(%mere gift:able:clay) :: XX %slip == == :: - $: %c :: + $: %clay :: $> $? %mere :: %note :: %writ :: == :: gift:able:clay :: == :: - $: %d :: + $: %dill :: $>(%blit gift:able:dill) :: == :: - $: %g :: + $: %gall :: $> $? %onto :: %unto :: == :: @@ -255,14 +255,14 @@ |= [tea=wire sih=sign] ^+ +> ?- sih - [%g %onto *] + [%gall %onto *] :: ~& [%take-gall-onto +>.sih] ?- -.+>.sih %| (crud %onto p.p.+>.sih) %& (done %blit [%lin (tuba "{