From fb97528fd472ba402b8e29a485007a1f1db47385 Mon Sep 17 00:00:00 2001 From: fang Date: Sat, 21 Nov 2020 22:04:18 +0100 Subject: [PATCH] arvo: unflop the spur in scry No longer use reversed paths in sley-style peek handling. --- pkg/arvo/sys/arvo.hoon | 4 ++-- pkg/arvo/sys/vane/eyre.hoon | 6 +++--- pkg/arvo/sys/vane/gall.hoon | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/arvo/sys/arvo.hoon b/pkg/arvo/sys/arvo.hoon index 7c28d9e59..10d02a301 100644 --- a/pkg/arvo/sys/arvo.hoon +++ b/pkg/arvo/sys/arvo.hoon @@ -200,7 +200,7 @@ ?. ?=(^ ved) ~ =/ ron=@tas u.hyr =/ bed=beam - [[u.fal u.dyc (case p.u.ved)] (flop tyl)] + [[u.fal u.dyc (case p.u.ved)] tyl] =/ bop=(unit (unit (cask meta))) (sod ref ~ ron bed) ?~ bop ~ @@ -453,7 +453,7 @@ [%& p.bed] q.bed `coin`[%$ r.bed] - (flop s.bed) + s.bed == :: :: |spin:plow:va: move statefully diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon index 758e7d410..6643a0c42 100644 --- a/pkg/arvo/sys/vane/eyre.hoon +++ b/pkg/arvo/sys/vane/eyre.hoon @@ -644,7 +644,7 @@ ?- -.action %gen =/ bek=beak [our desk.generator.action da+now] - =/ sup=spur (flop path.generator.action) + =/ sup=spur path.generator.action =/ ski (scry [%141 %noun] ~ %ca bek sup) =/ cag=cage (need (need ski)) ?> =(%vase p.cag) @@ -768,7 +768,7 @@ ++ do-scry |= [care=term =desk =path] ^- (unit (unit cage)) - (scry [%141 %noun] ~ care [our desk da+now] (flop path)) + (scry [%141 %noun] ~ care [our desk da+now] path) :: ++ error-response |= [status=@ud =tape] @@ -1650,7 +1650,7 @@ =* desc=tape "from {(trip have)} to json" =/ tube=(unit tube:clay) =/ tuc=(unit (unit cage)) - (scry [%141 %noun] ~ %cc [our %home da+now] (flop /[have]/json)) + (scry [%141 %noun] ~ %cc [our %home da+now] /[have]/json) ?. ?=([~ ~ *] tuc) ~ `!<(tube:clay q.u.u.tuc) ?~ tube diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon index aecfdcc5c..8840909ba 100644 --- a/pkg/arvo/sys/vane/gall.hoon +++ b/pkg/arvo/sys/vane/gall.hoon @@ -473,7 +473,7 @@ |= [dap=term =case:clay] ^- (each agent tang) =/ bek=beak [our %home case] - =/ sky (ski [%141 %noun] ~ %ca bek /hoon/[dap]/app) + =/ sky (ski [%141 %noun] ~ %ca bek /app/[dap]/hoon) ?~ sky |+[leaf+"gall: {} scry blocked"]~ ?~ u.sky |+[leaf+"gall: {} scry failed"]~ =/ =cage u.u.sky @@ -903,7 +903,7 @@ =/ =case:clay da+now =/ =mars:clay [p.cage mark]:deal =/ mars-path /[a.mars]/[b.mars] - =/ sky (ski [%141 %noun] ~ %cc [our %home case] (flop mars-path)) + =/ sky (ski [%141 %noun] ~ %cc [our %home case] mars-path) ?- sky ?(~ [~ ~]) =/ ror "gall: poke cast fail :{(trip dap)} {}" @@ -1114,7 +1114,7 @@ =/ =case:clay da+now =/ bek=beak [our %home case] =/ mars-path /[a.mars]/[b.mars] - =/ sky (ski [%141 %noun] ~ %cc bek (flop mars-path)) + =/ sky (ski [%141 %noun] ~ %cc bek mars-path) ?- sky ?(~ [~ ~]) %- (slog leaf+"watch-as fact conversion find-fail" >sky< ~) @@ -1278,7 +1278,7 @@ =/ tub=(unit tube:clay) ?: =(have want) `(bake same ^vase) =/ tuc=(unit (unit cage)) - (ski [%141 %noun] ~ %cc [our %home da+now] (flop /[have]/[want])) + (ski [%141 %noun] ~ %cc [our %home da+now] /[have]/[want]) ?. ?=([~ ~ *] tuc) ~ `!<(tube:clay q.u.u.tuc) ?~ tub