From 508c5bd53cba63e54175830c2238fe2154e933a4 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Thu, 10 Aug 2023 22:43:59 -0400 Subject: [PATCH 1/5] hoon: fix gol type enforcement for trivial %cnts --- pkg/arvo/sys/hoon.hoon | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index db9363894..d66dc0674 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -9238,21 +9238,21 @@ :: ++ mint |= gol=type + =- ?>(?|(!vet (nest(sut gol) & p.-)) -) ^- (pair type nock) =+ lug=(find %read hyp) ?: ?=(%| -.lug) ~>(%mean.'hoon' ?>(?=(~ rig) p.lug)) - =- ?>(?|(!vet (nest(sut gol) & p.-)) -) (ergo p.lug rig) :: ++ mull |= [gol=type dox=type] - ^- [type type] + =- ?>(?|(!vet (nest(sut gol) & p.-)) -) + ^- (pair type type) =+ lug=[p=(find %read hyp) q=(find(sut dox) %read hyp)] ?: ?=(%| -.p.lug) ?> &(?=(%| -.q.lug) ?=(~ rig)) [p.p.p.lug p.p.q.lug] ?> ?=(%& -.q.lug) - =- ?>(?|(!vet (nest(sut gol) & p.-)) -) (endo [p.p.lug p.q.lug] dox rig) -- :: From b2a3350afda56123c853ed28e753f766aac5337d Mon Sep 17 00:00:00 2001 From: Tinnus Napbus Date: Sat, 16 Sep 2023 01:31:17 +1200 Subject: [PATCH 2/5] kiln: %jump-ask mark noun:grab structure mode --- pkg/arvo/mar/kiln/jump-ask.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/arvo/mar/kiln/jump-ask.hoon b/pkg/arvo/mar/kiln/jump-ask.hoon index 0e6ce52be..f75f570aa 100644 --- a/pkg/arvo/mar/kiln/jump-ask.hoon +++ b/pkg/arvo/mar/kiln/jump-ask.hoon @@ -10,7 +10,7 @@ -- ++ grab |% - ++ noun ,[dock dock] + +$ noun [dock dock] -- ++ grad %noun -- From 00bc41261949953ef129304e2daf7be9c147b0fd Mon Sep 17 00:00:00 2001 From: Tinnus Napbus Date: Sat, 16 Sep 2023 01:34:01 +1200 Subject: [PATCH 3/5] kiln: simplify ++frond call in %kiln-jump mark --- pkg/arvo/mar/kiln/jump.hoon | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/arvo/mar/kiln/jump.hoon b/pkg/arvo/mar/kiln/jump.hoon index 540f35a89..d0ca57511 100644 --- a/pkg/arvo/mar/kiln/jump.hoon +++ b/pkg/arvo/mar/kiln/jump.hoon @@ -10,21 +10,12 @@ ++ json =, enjs:format |^ ^- ^json + %+ frond -.jum ?- -.jum - %add - %+ frond 'add' - (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) - :: - %yea - %+ frond 'yea' - (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) - :: - %nay - %+ frond 'nay' - (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) - :: + %add (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) + %yea (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) + %nay (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) %all - %+ frond 'all' :- %a %+ turn ~(tap by all.jum) |= [old=dock new=dock] From e9a618e1847e724eae9486bfe4d8f21f0f6cad92 Mon Sep 17 00:00:00 2001 From: Tinnus Napbus Date: Sat, 16 Sep 2023 02:53:41 +1200 Subject: [PATCH 4/5] kiln: change jump-related @p printing to scow's --- pkg/arvo/lib/hood/kiln.hoon | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon index a55c580ef..394b76321 100644 --- a/pkg/arvo/lib/hood/kiln.hoon +++ b/pkg/arvo/lib/hood/kiln.hoon @@ -789,7 +789,7 @@ =. hop (~(del by hop) old) abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old u.had])) ?~ (skim ~(tap by sources) |=(kiln-sync =(old [her sud]))) - ~> %slog.(fmt "no syncs from {}/{(trip q.old)}") + ~> %slog.(fmt "no syncs from {(scow %p p.old)}/{(trip q.old)}") abet =. hop (~(put by hop) old new) abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%add old new])) @@ -797,16 +797,16 @@ ++ poke-jump-opt |= [old=dock new=dock yea=?] ?~ got=(~(get by hop) old) - ~> %slog.(fmt "no jump request for {}/{(trip q.old)}") + ~> %slog.(fmt "no jump request for {(scow %p p.old)}/{(trip q.old)}") abet ?. =(new u.got) - =/ txt-old "{}/{(trip q.old)}" - =/ txt-new "{}/{(trip q.new)}" + =/ txt-old "{(scow %p p.old)}/{(trip q.old)}" + =/ txt-new "{(scow %p p.new)}/{(trip q.new)}" ~> %slog.(fmt "no jump request from {txt-old} to {txt-new}") abet ?. yea - =/ txt-old "{}/{(trip q.old)}" - =/ txt-new "{}/{(trip q.new)}" + =/ txt-old "{(scow %p p.old)}/{(trip q.old)}" + =/ txt-new "{(scow %p p.new)}/{(trip q.new)}" ~> %slog.(fmt "denied jump from {txt-old} to {txt-new}") =. hop (~(del by hop) old) abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old new])) From 21fe99ac472be860867d55075ed17feb88c08578 Mon Sep 17 00:00:00 2001 From: Tinnus Napbus Date: Sat, 30 Sep 2023 13:09:19 +1300 Subject: [PATCH 5/5] kiln: tweak jump mark structures --- pkg/arvo/mar/kiln/jump-ask.hoon | 17 +--------------- pkg/arvo/mar/kiln/jump.hoon | 35 +-------------------------------- 2 files changed, 2 insertions(+), 50 deletions(-) mode change 100644 => 120000 pkg/arvo/mar/kiln/jump-ask.hoon mode change 100644 => 120000 pkg/arvo/mar/kiln/jump.hoon diff --git a/pkg/arvo/mar/kiln/jump-ask.hoon b/pkg/arvo/mar/kiln/jump-ask.hoon deleted file mode 100644 index f75f570aa..000000000 --- a/pkg/arvo/mar/kiln/jump-ask.hoon +++ /dev/null @@ -1,16 +0,0 @@ -:: -:::: /hoon/jump-ask/kiln/mar - :: -/? 310 -|_ req=[old=dock new=dock] -:: -++ grow - |% - ++ noun req - -- -++ grab - |% - +$ noun [dock dock] - -- -++ grad %noun --- diff --git a/pkg/arvo/mar/kiln/jump-ask.hoon b/pkg/arvo/mar/kiln/jump-ask.hoon new file mode 120000 index 000000000..c13477815 --- /dev/null +++ b/pkg/arvo/mar/kiln/jump-ask.hoon @@ -0,0 +1 @@ +../../../base-dev/mar/kiln/jump-ask.hoon \ No newline at end of file diff --git a/pkg/arvo/mar/kiln/jump.hoon b/pkg/arvo/mar/kiln/jump.hoon deleted file mode 100644 index d0ca57511..000000000 --- a/pkg/arvo/mar/kiln/jump.hoon +++ /dev/null @@ -1,34 +0,0 @@ -:: -:::: /hoon/jump/kiln/mar - :: -/- h=hood -|_ jum=jump:h -:: -++ grow - |% - ++ noun jum - ++ json - =, enjs:format - |^ ^- ^json - %+ frond -.jum - ?- -.jum - %add (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) - %yea (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) - %nay (pairs ['old' (en-dock old.jum)] ['new' (en-dock new.jum)] ~) - %all - :- %a - %+ turn ~(tap by all.jum) - |= [old=dock new=dock] - (pairs ['old' (en-dock old)] ['new' (en-dock new)] ~) - == - ++ en-dock - |= =dock - (pairs ['ship' s+(scot %p p.dock)] ['desk' s+q.dock] ~) - -- - -- -++ grab - |% - ++ noun jump:h - -- -++ grad %noun --- diff --git a/pkg/arvo/mar/kiln/jump.hoon b/pkg/arvo/mar/kiln/jump.hoon new file mode 120000 index 000000000..c8e820236 --- /dev/null +++ b/pkg/arvo/mar/kiln/jump.hoon @@ -0,0 +1 @@ +../../../base-dev/mar/kiln/jump.hoon \ No newline at end of file