From 41833dcdc8bc0e2a689282799602ca2985802988 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 30 Oct 2018 15:14:26 -0400 Subject: [PATCH] Revert "adds lane-change subscriptions (%tend/%rove) to ames" This reverts commit adc9da0b0cdf1a056df28b4ffd7c2e8ce3cde659. --- sys/vane/ames.hoon | 38 +------------------------------------- sys/vane/gall.hoon | 1 - sys/zuse.hoon | 4 ---- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index 4cd12228b8..f0562c67e2 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -70,7 +70,6 @@ ++ as :: as:go |_ [our=ship saf=sufi] :: per server ++ lax :: lax:as:go - =| rov=(unit lane) :: maybe lane change |_ [her=ship dur=dore] :: per client ++ cluy :: cluy:lax:as:go ^- [lyf=life cub=acru] :: client crypto @@ -139,26 +138,6 @@ [~ ryn] lun.wod.dur [~ ryn] - :: - rov - |- ^- (unit lane) - :: XX jael scry - :: - ?: ?| !=(our (^sein:title her)) - ?=(?(%earl %pawn) (clan:title her)) - == - ~ - ?- ryn - [%if *] ?. ?=([~ %if *] lun.wod.dur) - `ryn - ?:(=(r.u.lun.wod.dur r.ryn) ~ `ryn) - :: - [%ix *] ?. ?=([~ %ix *] lun.wod.dur) - `ryn - ?:(=(r.u.lun.wod.dur r.ryn) ~ `ryn) - :: - [%is *] ?~(q.ryn ~ $(ryn u.q.ryn)) - == == :: ++ wist :: wist:lax:as:go @@ -1162,10 +1141,8 @@ == :: ++ zank :: zank:ho:um:am - =? bin ?=(^ rov.diz) - [[%maze her u.rov.diz] bin] %= +>.$ :: resolve - gus (nux:gus diz(rov ~)) + gus (nux:gus diz) wab.weg (~(put by wab.weg) her bah(sop abet:puz)) == :: @@ -1304,11 +1281,6 @@ :_ fox :~ [s.bon %give %woot q.p.bon r.bon] == - :: - %maze - :_ fox - %+ turn ~(tap in ten.fox) - |=(hen=duct [hen %give %rove p.bon q.bon]) :: %mead :_(fox [[hen [%give %hear p.bon q.bon]] ~]) %milk @@ -1460,14 +1432,6 @@ :: %kick (~(kick am [now fox(hop p.kyz) ski]) hen) - :: - %tend - :: XX exclude comets and moons? and planets? - :: ?> &(?=(^ hen) ?=([@ @ *] i.hen)) - :: =/ who=@p (slav %p i.t.i.hen) - :: ?: ?=((%earl %pawn) (clan:title who)) - :: [~ fox] - [~ fox(ten (~(put in ten.fox) hen))] :: %nuke :- ~ diff --git a/sys/vane/gall.hoon b/sys/vane/gall.hoon index a2c0f0ab53..5004f71e83 100644 --- a/sys/vane/gall.hoon +++ b/sys/vane/gall.hoon @@ -1241,7 +1241,6 @@ $perm `%c $rule `%e $serv `%e - $tend `%a $them `%e $wait `%b $want `%a diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 4455144394..b82a4d0d82 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -494,7 +494,6 @@ $% {$hear p/lane q/@} :: receive packet {$mack p/(unit tang)} :: {$mass p/mass} :: memory usage - {$rove p/ship q/lane} :: lane change {$send p/lane q/@} :: transmit packet {$turf p/(list turf)} :: bind to domains {$woot p/ship q/coop} :: reaction message @@ -526,7 +525,6 @@ {$kick p/@da} :: wake up {$nuke p/@p} :: toggle auto-block {$sunk p=ship q=life} :: report death - {$tend ~} :: watch lane changes {$wake ~} :: timer activate {$wegh ~} :: report memory {$west p/sack q/path r/*} :: network request @@ -570,7 +568,6 @@ {$bock ~} :: bind to domains {$brew ~} :: request domains {$cake p/sock q/soap r/coop s/duct} :: e2e message result - {$maze p/ship q/lane} :: lane change {$mead p/lane q/rock} :: accept packet {$milk p/sock q/soap r/*} :: e2e pass message {$ouzo p/lane q/rock} :: transmit packet @@ -613,7 +610,6 @@ bad/(set @p) :: bad ships ton/town :: security zac/(map ship corn) :: flows by server - ten/(set duct) :: watch lanes == :: ++ hand @uvH :: 128-bit hash ++ lane :: packet route