From 06e65458903c39993df7e88a7d040cc8a2a62cc2 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Thu, 14 Nov 2019 14:46:39 -0800
Subject: [PATCH] ph: get more tests working

---
 pkg/arvo/age/aqua.hoon              |  2 +-
 pkg/arvo/age/eth-watcher.hoon       |  8 +++++---
 pkg/arvo/imp/aqua/eyre-azimuth.hoon |  1 +
 pkg/arvo/imp/ph/breach-hi.hoon      | 15 ++++++++-------
 pkg/arvo/imp/ph/hi-az.hoon          | 14 +++++++-------
 pkg/arvo/imp/ph/moon-az.hoon        | 21 +++++++++++----------
 6 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/pkg/arvo/age/aqua.hoon b/pkg/arvo/age/aqua.hoon
index 58feef3c5d..1ed09d43bc 100644
--- a/pkg/arvo/age/aqua.hoon
+++ b/pkg/arvo/age/aqua.hoon
@@ -391,7 +391,7 @@
       [%swap-files ~]
     =.  userspace-ova.pil
       =/  slim-dirs=(list path)
-        ~[/app /gen /lib /mar /sur /hoon/sys /arvo/sys /zuse/sys /age]
+        ~[/app /age /imp /gen /lib /mar /sur /hoon/sys /arvo/sys /zuse/sys]
       :_  ~
       %-  unix-event
       %-  %*(. file-ovum:pill-lib directories slim-dirs)
diff --git a/pkg/arvo/age/eth-watcher.hoon b/pkg/arvo/age/eth-watcher.hoon
index fb02e8e0bc..035cf34999 100644
--- a/pkg/arvo/age/eth-watcher.hoon
+++ b/pkg/arvo/age/eth-watcher.hoon
@@ -6,7 +6,7 @@
 =,  able:jael
 ::
 =>  |%
-    ++  refresh-rate  ~m5
+    ++  refresh-rate  ~m1  ::  ~m5
     --
 ::
 =>  |%
@@ -298,8 +298,10 @@
       ::
       =/  =cage  [%spider-stop !>([u.running.dog |])]
       =.  cards
-        :_  cards
-        [%pass [%starting path] %agent [our.bowl %spider] %poke cage]
+        :*  [%pass [%starting path] %agent [our.bowl %spider] %poke cage]
+            (leave-spider path our.bowl)
+            cards
+        ==
       loop(i.dogs i.dogs(running.dog ~))
     ::
     =^  rand  iid-gen  (raws:iid-gen 128)
diff --git a/pkg/arvo/imp/aqua/eyre-azimuth.hoon b/pkg/arvo/imp/aqua/eyre-azimuth.hoon
index 9f39667ad3..0b3f4562b9 100644
--- a/pkg/arvo/imp/aqua/eyre-azimuth.hoon
+++ b/pkg/arvo/imp/aqua/eyre-azimuth.hoon
@@ -260,6 +260,7 @@
 ::
 ++  dawn
   |=  [who=ship seed=(unit seed:able:jael)]
+  =-  ~&  >>  [%dawn-event -]  -
   ^-  dawn-event:able:jael
   =/  spon=(list [ship point:azimuth])
     |-  ^-  (list [ship point:azimuth])
diff --git a/pkg/arvo/imp/ph/breach-hi.hoon b/pkg/arvo/imp/ph/breach-hi.hoon
index bba7d8b18f..42f61f351d 100644
--- a/pkg/arvo/imp/ph/breach-hi.hoon
+++ b/pkg/arvo/imp/ph/breach-hi.hoon
@@ -4,15 +4,16 @@
 ^-  imp:spider
 |=  [=bowl:spider vase]
 =/  m  (thread ,vase)
-;<  ~  bind:m  start-azimuth
-;<  ~  bind:m  (spawn ~bud)
-;<  ~  bind:m  (spawn ~dev)
-;<  ~  bind:m  (real-ship ~bud)
-;<  ~  bind:m  (real-ship ~dev)
+;<  az=iid:spider  bind:m
+  start-azimuth
+;<  ~  bind:m  (spawn az ~bud)
+;<  ~  bind:m  (spawn az ~dev)
+;<  ~  bind:m  (real-ship az ~bud)
+;<  ~  bind:m  (real-ship az ~dev)
 ;<  ~  bind:m  (send-hi ~bud ~dev)
-;<  ~  bind:m  (breach-and-hear ~dev ~bud)
+;<  ~  bind:m  (breach-and-hear az ~dev ~bud)
 ;<  ~  bind:m  (send-hi-not-responding ~bud ~dev)
-;<  ~  bind:m  (real-ship ~dev)
+;<  ~  bind:m  (real-ship az ~dev)
 ;<  ~  bind:m  (wait-for-output ~bud "hi ~dev successful")
 ;<  ~  bind:m  end-azimuth
 (pure:m *vase)
diff --git a/pkg/arvo/imp/ph/hi-az.hoon b/pkg/arvo/imp/ph/hi-az.hoon
index efd64b673f..7635ba9540 100644
--- a/pkg/arvo/imp/ph/hi-az.hoon
+++ b/pkg/arvo/imp/ph/hi-az.hoon
@@ -4,11 +4,11 @@
 ^-  imp:spider
 |=  [=bowl:spider vase]
 =/  m  (thread ,vase)
-;<  ~  bind:m  start-azimuth
-;<  ~  bind:m  (spawn ~bud)
-;<  ~  bind:m  (spawn ~dev)
-;<  ~  bind:m  (real-ship ~bud)
-;<  ~  bind:m  (real-ship ~dev)
-;<  ~  bind:m  (send-hi ~bud ~dev)
-;<  ~  bind:m  end-azimuth
+;<  az=iid:spider  bind:m  start-azimuth
+;<  ~              bind:m  (spawn az ~bud)
+;<  ~              bind:m  (spawn az ~dev)
+;<  ~              bind:m  (real-ship az ~bud)
+;<  ~              bind:m  (real-ship az ~dev)
+;<  ~              bind:m  (send-hi ~bud ~dev)
+;<  ~              bind:m  end-azimuth
 (pure:m *vase)
diff --git a/pkg/arvo/imp/ph/moon-az.hoon b/pkg/arvo/imp/ph/moon-az.hoon
index 490a9b1e24..bf00050432 100644
--- a/pkg/arvo/imp/ph/moon-az.hoon
+++ b/pkg/arvo/imp/ph/moon-az.hoon
@@ -4,18 +4,19 @@
 ^-  imp:spider
 |=  [=bowl:spider vase]
 =/  m  (thread ,vase)
-;<  ~  bind:m  start-azimuth
-;<  ~  bind:m  (spawn ~bud)
-;<  ~  bind:m  (spawn ~marbud)
-;<  ~  bind:m  (spawn ~linnup-torsyx)
-;<  ~  bind:m  (spawn ~dev)
-;<  ~  bind:m  (real-ship ~bud)
-;<  ~  bind:m  (real-ship ~marbud)
-;<  ~  bind:m  (real-ship ~linnup-torsyx)
-;<  ~  bind:m  (real-ship ~linnup-torsyx-linnup-torsyx)
+;<  az=iid:spider  bind:m
+  start-azimuth
+;<  ~  bind:m  (spawn az ~bud)
+;<  ~  bind:m  (spawn az ~marbud)
+;<  ~  bind:m  (spawn az ~linnup-torsyx)
+;<  ~  bind:m  (spawn az ~dev)
+;<  ~  bind:m  (real-ship az ~bud)
+;<  ~  bind:m  (real-ship az ~marbud)
+;<  ~  bind:m  (real-ship az ~linnup-torsyx)
+;<  ~  bind:m  (real-ship az ~linnup-torsyx-linnup-torsyx)
 ;<  ~  bind:m  (send-hi ~bud ~linnup-torsyx-linnup-torsyx)
 ;<  ~  bind:m  (send-hi ~linnup-torsyx-linnup-torsyx ~marbud)
-;<  ~  bind:m  (real-ship ~dev)
+;<  ~  bind:m  (real-ship az ~dev)
 ;<  ~  bind:m  (send-hi ~linnup-torsyx-linnup-torsyx ~dev)
 ;<  ~  bind:m  (send-hi ~dev ~linnup-torsyx-linnup-torsyx)
 ;<  ~  bind:m  end-azimuth