working after rearchitecture

app/aqua-behn.hoon

@@ -110,8 +110,8 @@
   ::
   ++  cancel-timer
     ~&  [who=who %cancell-timer (need next-timer)]
-    =.  next-timer  ~
     =.  this  (emit-moves [ost %rest /(scot %p who) (need next-timer)]~)
+    =.  next-timer  ~
     ..abet-pe
   ::
   ++  take-wake

app/aqua.hoon

@@ -218,27 +218,27 @@
       =/  ufs  (~(get ja unix-effects) who)
       ?~  ufs
         ~
-      [b %diff %aqua-effects who ufs]~
+      [b %diff %aqua-effects who (flop ufs)]~
     ::
         [%effects ~]
       %+  turn
         ~(tap by unix-effects)
       |=  [who=ship ufs=(list unix-effect)]
-      [b %diff %aqua-effects who ufs]
+      [b %diff %aqua-effects who (flop ufs)]
     ::
         [%events @ ~]
       =/  who  (slav %p i.t.pax)
       =/  ve  (~(get ja unix-events) who)
       ?~  ve
         ~
-      [b %diff %aqua-events who ve]~
+      [b %diff %aqua-events who (flop ve)]~
     ::
         [%boths @ ~]
       =/  who  (slav %p i.t.pax)
       =/  bo  (~(get ja unix-boths) who)
       ?~  bo
         ~
-      [b %diff %aqua-boths who bo]~
+      [b %diff %aqua-boths who (flop bo)]~
     ==
   [(flop moves) this]
 ::

app/ph.hoon

@@ -62,14 +62,12 @@
     :~
       :-  %add
       ^-  raw-test-core
-      =+  num=5
       |%
       ++  label  %add
       ++  ships  ~[~bud]
       ++  start
         |=  now=@da
         ^-  (pair (list ph-event) _..start)
-        =.  num  +(num)
         :_  ..start
         %-  zing
         :~  (init ~bud ~)
@@ -79,7 +77,6 @@
       ++  route
         |=  [now=@da who=ship uf=unix-effect]
         ^-  [? (quip ph-event _..start)]
-        ~&  [%num num]
         :-  &
         :_  ..start
         (expect-dojo-output ~bud who uf "[%test-result 5]")
@@ -208,7 +205,7 @@
   ^-  (unit move)
   ?.  ?=([%effects ~] pax)
     ~
-  `[ost.hid %diff %aqua-effects afs]
+  `[b %diff %aqua-effects afs]
 ::
 ++  run-events
   |=  [lab=term what=(list ph-event)]
@@ -220,7 +217,7 @@
     ?~  what
       [%& ~]
     ?:  ?=(%test-done -.i.what)
-      ~&  ?~(p.i.what "test successful" "test failed")
+      ~&  ?~(p.i.what "TEST SUCCESSFUL" "TEST FAILED")
       [%| ~]
     =/  nex  $(what t.what)
     ?:  ?=(%| -.nex)
@@ -271,7 +268,6 @@
 ::
 ++  poke-noun
   |=  arg=*
-  ~&  %herm
   ^-  (quip move _this)
   ?+  arg  ~|(%bad-noun-arg !!)
       %init
@@ -279,7 +275,7 @@
     %-  zing  ^-  (list (list move))
     %+  turn
       ^-  (list term)
-      ~[%aqua-ames %aqua-behn %aqua-dill %aqua-eyre]
+      ~[%aqua %aqua-ames %aqua-behn %aqua-dill %aqua-eyre]
     |=  vane-app=term
     :~  [ost.hid %poke /start [our.hid %hood] %drum-start %home vane-app]
         [ost.hid %poke /init [our.hid vane-app] %aqua-vane-control %subscribe]

lib/ph.hoon

@@ -219,13 +219,13 @@
       ^-  (quip ph-event _..start)
       =/  have-cache
         (scry-aqua ? now /fleet-snap/[label:a]/noun)
-      ?:  have-cache
-        ~&  [%caching-in label:a label]
-        =.  done-with-a  &
-        =/  restore-event  [%restore-snap label:a]
-        =^  events-start  b  (start:b now)
-        =^  events  ..filter-a  (filter-a now restore-event events-start)
-        [events ..start]
+      ::  ?:  have-cache
+      ::    ~&  [%caching-in label:a label]
+      ::    =.  done-with-a  &
+      ::    =/  restore-event  [%restore-snap label:a]
+      ::    =^  events-start  b  (start:b now)
+      ::    =^  events  ..filter-a  (filter-a now restore-event events-start)
+      ::    [events ..start]
       =^  events  a  (start:a now)
       [events ..start]
     ::