From 8cb75a8d3a836db1c93ecfbd813994372fdb8724 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Sun, 6 Dec 2020 01:21:57 -0800 Subject: [PATCH] %zuse: remove vestigial parts of legacy %init system --- pkg/arvo/sys/vane/dill.hoon | 15 ++------------- pkg/arvo/sys/vane/jael.hoon | 22 ++++++++++------------ pkg/arvo/sys/zuse.hoon | 8 +++----- pkg/arvo/tests/sys/vane/eyre.hoon | 26 +++++++++++++------------- pkg/arvo/tests/sys/vane/gall.hoon | 2 +- 5 files changed, 29 insertions(+), 44 deletions(-) diff --git a/pkg/arvo/sys/vane/dill.hoon b/pkg/arvo/sys/vane/dill.hoon index 74f98da976..45c8d269d8 100644 --- a/pkg/arvo/sys/vane/dill.hoon +++ b/pkg/arvo/sys/vane/dill.hoon @@ -46,7 +46,6 @@ $: %d :: $> $? %crud :: %heft :: - %init :: XX obsolete? %text :: %verb :: == :: @@ -66,7 +65,7 @@ task:able:jael :: == == :: +$ sign :: in result $<- - $~ [%j %init *@p] :: + $~ [%d %blit ~] :: $% $: %b :: $% $>(%writ gift:able:clay) :: XX %slip $>(%mere gift:able:clay) :: XX %slip @@ -86,11 +85,6 @@ %unto :: == :: gift:able:gall :: - == :: - $: %j :: - $> $? %init :: - == :: - gift:able:jael :: == == :: :::::::: :: dill tiles -- @@ -261,11 +255,6 @@ |= [tea=wire sih=sign] ^+ +> ?- sih - [%j %init *] - :: pass thru to unix - :: - +>(moz :_(moz [hen %give +.sih])) - :: [%g %onto *] :: ~& [%take-gall-onto +>.sih] ?- -.+>.sih @@ -338,7 +327,7 @@ ~| invalid-boot-event+hen !! =. lit.all lit.task [[hen %pass / %j u.boot]~ ..^$] - :: we are subsequently initialized. single-home + :: we are subsequently initialized. :: ?: ?=(%init -.task) ?> =(~ dug.all) diff --git a/pkg/arvo/sys/vane/jael.hoon b/pkg/arvo/sys/vane/jael.hoon index 38b5ea342b..bafd2304fb 100644 --- a/pkg/arvo/sys/vane/jael.hoon +++ b/pkg/arvo/sys/vane/jael.hoon @@ -348,12 +348,11 @@ :: %jael init must be deferred (makes http requests) :: ^- (list move) - :~ [hen %give %init our] - [hen %slip %e %init our] - [hen %slip %d %init our] - [hen %slip %g %init our] - [hen %slip %c %init our] - [hen %slip %a %init our] + :~ [hen %slip %e %init ~] + [hen %slip %d %init ~] + [hen %slip %g %init ~] + [hen %slip %c %init ~] + [hen %slip %a %init ~] == +>.$ :: @@ -390,12 +389,11 @@ =. moz %+ weld moz ^- (list move) - :~ [hen %give %init our] - [hen %slip %e %init our] - [hen %slip %d %init our] - [hen %slip %g %init our] - [hen %slip %c %init our] - [hen %slip %a %init our] + :~ [hen %slip %e %init ~] + [hen %slip %d %init ~] + [hen %slip %g %init ~] + [hen %slip %c %init ~] + [hen %slip %a %init ~] == +>.$ :: diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon index 4c98f35805..80821f8684 100644 --- a/pkg/arvo/sys/zuse.hoon +++ b/pkg/arvo/sys/zuse.hoon @@ -196,7 +196,7 @@ [%crud p=@tas q=(list tank)] :: boot completed (XX legacy) :: - [%init p=ship] + [%init ~] :: trim state (in response to memory pressure) :: [%trim p=@ud] @@ -1096,7 +1096,6 @@ $% [%bbye ~] :: reset prompt [%blit p=(list blit)] :: terminal output [%burl p=@t] :: activate url - [%init p=@p] :: set owner [%logo ~] :: logout [%meld ~] :: unify memory [%pack ~] :: compact memory @@ -1953,8 +1952,7 @@ == :: :: +$ gift :: out result <-$ - $% [%init p=ship] :: report install unix - [%done error=(unit error:ames)] :: ames message (n)ack + $% [%done error=(unit error:ames)] :: ames message (n)ack [%boon payload=*] :: ames response [%private-keys =life vein=(map life ring)] :: private keys [%public-keys =public-keys-result] :: ethereum changes @@ -2163,7 +2161,7 @@ -- :: jael :: +$ gift-arvo :: out result <-$ - $~ [%init ~zod] + $~ [%doze ~] $% gift:able:ames gift:able:behn gift:able:clay diff --git a/pkg/arvo/tests/sys/vane/eyre.hoon b/pkg/arvo/tests/sys/vane/eyre.hoon index 88886c0949..feca404860 100644 --- a/pkg/arvo/tests/sys/vane/eyre.hoon +++ b/pkg/arvo/tests/sys/vane/eyre.hoon @@ -12,7 +12,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: @@ -25,7 +25,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -62,7 +62,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -134,7 +134,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -183,7 +183,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: when there's no configuration and nothing matches, expect 404 @@ -226,7 +226,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -319,7 +319,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -422,7 +422,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -537,7 +537,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -701,7 +701,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: gen1 binds successfully @@ -836,7 +836,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: @@ -1926,7 +1926,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: app1 binds successfully @@ -2262,7 +2262,7 @@ eyre-gate now=~1111.1.1 scry=scry-provides-code - call-args=[duct=~[/init] ~ [%init ~nul]] + call-args=[duct=~[/init] ~ [%init ~]] expected-moves=~ == :: ensure there's an authenticated session diff --git a/pkg/arvo/tests/sys/vane/gall.hoon b/pkg/arvo/tests/sys/vane/gall.hoon index 1df1a91768..76377dc4c3 100644 --- a/pkg/arvo/tests/sys/vane/gall.hoon +++ b/pkg/arvo/tests/sys/vane/gall.hoon @@ -13,7 +13,7 @@ :: =/ call-args =/ =duct ~[/init] - =/ =task:able:gall [%init ~nec] + =/ =task:able:gall [%init ~] [duct task] :: =/ expected-moves=(list move:gall-gate) ~