From dd57a72a4d8d189b163b020b0206e0c469b9cc03 Mon Sep 17 00:00:00 2001 From: Philip Monk Date: Thu, 15 Jul 2021 20:02:05 -0400 Subject: [PATCH] naive: sponsorship fixes --- pkg/arvo/lib/naive.hoon | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/arvo/lib/naive.hoon b/pkg/arvo/lib/naive.hoon index cbdef687e6..e991ee585b 100644 --- a/pkg/arvo/lib/naive.hoon +++ b/pkg/arvo/lib/naive.hoon @@ -572,7 +572,7 @@ =* parent=@ i.t.t.topics.log =/ parent-point (get-point state parent) ?> ?=(^ parent-point) - ?: |(?=(%l2 -.point) ?=(%l2 -.u.parent-point)) `point + ?: ?=(%l2 -.u.parent-point) `point :- [%point ship %sponsor `parent]~ point(escape.net ~, sponsor.net [%& parent]) :: @@ -594,12 +594,16 @@ :- [%point ship %sponsor ~]~ point(has.sponsor.net %|) :: + :: The rest can be done by any ship on L1, even if their spawn proxy + :: is set to L2 + :: + ?: ?=(%l2 -.point) `point + :: ?: =(log-name escape-requested:log-names) ?> ?=([@ ~] t.t.topics.log) =* parent=@ i.t.t.topics.log =/ parent-point (get-point state parent) ?> ?=(^ parent-point) - ?: |(?=(%l2 -.point) ?=(%l2 -.u.parent-point)) `point :- [%point ship %escape `parent]~ point(escape.net `parent) :: @@ -608,15 +612,9 @@ =* parent=@ i.t.t.topics.log =/ parent-point (get-point state parent) ?> ?=(^ parent-point) - ?: |(?=(%l2 -.point) ?=(%l2 -.u.parent-point)) `point :- [%point ship %escape ~]~ point(escape.net ~) :: - :: The rest can be done by any ship on L1, even if their spawn proxy - :: is set to L2 - :: - ?: ?=(%l2 -.point) `point - :: ?: =(log-name broke-continuity:log-names) ?> ?=(~ t.t.topics.log) =* rift=@ data.log @@ -756,6 +754,7 @@ ^- (unit [effects ^state]) =/ point (get-point state ship) ?~ point (debug %strange-ship ~) + ?. ?=(%l2 -.u.point) (debug %ship-not-on-l2 ~) =/ res=(unit [=effects new-point=^point]) (fun u.point rest) ?~ res ~