From c46fb686ff21ce4ce6149b04539984b237a42767 Mon Sep 17 00:00:00 2001 From: Philip Monk Date: Mon, 12 Sep 2022 20:51:39 -0800 Subject: [PATCH] kiln: remove resolve XX's --- pkg/arvo/sys/vane/clay.hoon | 2 +- pkg/base-dev/sur/hood.hoon | 51 +++++-------------------------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 24f641c45f..c0cb25270d 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -126,7 +126,7 @@ fod=flue :: ford cache wic=(map weft yoki) :: commit-in-waiting liv=zest :: running agents - ren=(map dude:gall ?) :: force agents on/off + ren=rein :: force agents on/off == :: :: :: Commit state. diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon index 8063c7274e..ee49d5e664 100644 --- a/pkg/base-dev/sur/hood.hoon +++ b/pkg/base-dev/sur/hood.hoon @@ -167,12 +167,11 @@ ?. .^(? %cu pax) ~ `.^(ship %cx pax) :: -:: XX -:: ++ get-apps-live -:: |= [our=ship =desk now=@da] -:: ^- (list dude) -:: %+ murn (get-apps-have our desk now) -:: |=([=dude live=?] ?.(live ~ `dude)) +++ get-apps-live + |= [our=ship =desk now=@da] + ^- (list dude) + %+ murn (get-apps-have our desk now) + |=([=dude live=?] ?.(live ~ `dude)) :: +get-apps-have: find which apps Gall is running on a desk :: ++ get-apps-have @@ -180,17 +179,7 @@ ^- (list [=dude live=?]) %~ tap in .^((set [=dude live=?]) ge+/(scot %p our)/[desk]/(scot %da now)) -:: :: +get-apps-want: find which apps should be running on a desk -:: :: -:: ++ get-apps-want -:: |= [local=[our=ship =desk now=@da] duz=(list dude) =rein] -:: ^- (list dude) -:: ?. liv.rein ~ -:: ?. |(=(`zuse+zuse (read-kelvin-local local)) =(%base desk.local)) ~ -:: =. duz (skip duz ~(has in sub.rein)) -:: =. duz (weld duz (skip ~(tap in add.rein) ~(has in (sy duz)))) -:: duz -:: :: +:: ++ mergebase-hashes |= [our=@p syd=desk now=@da her=ship sud=desk] =/ her (scot %p her) @@ -202,15 +191,6 @@ ++ enjs =, enjs:format |% - :: XX - :: ++ vats - :: |= v=(list ^vat) - :: ^- json - :: %- pairs - :: %+ turn v - :: |= va=^vat - :: [desk.va (vat va)] - :: ++ tim |= t=@ ^- json @@ -223,16 +203,6 @@ da+(tim da.c) == :: - :: XX - :: ++ vat - :: |= v=^vat - :: %- pairs - :: :~ desk+s+desk.v - :: hash+s+(scot %uv hash.v) - :: cass+(cass cass.v) - :: arak+(arak arak.v) - :: == - :: ++ weft |= w=^weft %- pairs @@ -246,14 +216,5 @@ :~ aeon+(numb aeon.r) weft+(weft weft.r) == - :: - :: XX - :: ++ rein - :: |= r=^rein - :: %- pairs - :: :~ add+a+(turn ~(tap in add.r) (lead %s)) - :: sub+a+(turn ~(tap in sub.r) (lead %s)) - :: == - :: -- --