ph: clean up card structures

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e28039e2f563abd8eadd42e3e3fcff3a8d66aea8809caaa2cbf6427ed57176b
-size 12588345
+oid sha256:a2cde0b21e3a73fe26c98f0fb6bd5d5a2f8b2fbae28985e2aac98e474f82e80d
+size 12633194

pkg/arvo/lib/ph/azimuth.hoon

@@ -265,15 +265,12 @@
 ::
 ++  dawn
   |=  [who=ship seed=(unit seed:able:jael)]
-  ^-  dawn-event
+  ^-  dawn-event:able:jael
   =/  spon=(list [ship point:azimuth])
     |-  ^-  (list [ship point:azimuth])
     =/  =ship  (^sein:title who)
     =/  a-point=[^ship point:azimuth]
-      =/  spon-spon
-        ?:  ?=(%czar (clan:title ship))
-          [| ~zod]
-        [& (^sein:title ship)]
+      =/  spon-spon  [& (^sein:title ship)]
       =/  life-rift  ~|([ship lives] (~(got by lives) ship))
       =/  =life  lyfe.life-rift
       =/  =rift  rut.life-rift

pkg/arvo/lib/ph/tests.hoon

@@ -49,7 +49,7 @@
 ::  Boot ship; don't check it succeeded.
 ::
 ++  boot-ship
-  |=  [her=ship keys=(unit dawn-event)]
+  |=  [her=ship keys=(unit dawn-event:able:jael)]
   ^+  *form:(ph ,~)
   |=  ph-input
   [& (init her keys) %done ~]
@@ -96,7 +96,7 @@
 ::  Boot a ship and verify it booted.  Parent must already be booted.
 ::
 ++  raw-ship
-  |=  [her=ship keys=(unit dawn-event)]
+  |=  [her=ship keys=(unit dawn-event:able:jael)]
   =/  m  (ph ,~)
   ^-  form:m
   ;<  ~  bind:m  (boot-ship her keys)

pkg/arvo/lib/ph/util.hoon

@@ -16,7 +16,7 @@
 ::  Start a ship (low-level; prefer +raw-ship)
 ::
 ++  init
-  |=  [who=ship keys=(unit dawn-event)]
+  |=  [who=ship keys=(unit dawn-event:able:jael)]
   ^-  (list ph-event)
   [%init-ship who keys]~
 ::

pkg/arvo/lib/pill.hoon

@@ -13,19 +13,10 @@
   %+  pair  wire
   $%  [%wack p=@]
       [%whom p=ship]
-      [%boot $%([%fake p=ship] [%dawn p=dawn-event])]
+      [%boot $%($>(%fake task:able:jael) $>(%dawn task:able:jael))]
       unix-task
   ==
 ::
-+$  dawn-event
-  $:  =seed:able:jael
-      spon=(list [=ship point:azimuth])
-      czar=(map ship [=rift =life =pass])
-      turf=(list turf)
-      bloq=@ud
-      node=(unit purl:eyre)
-  ==
-::
 ++  module-ova
   |=  sys=path
   ^-  (list [wire [%veer term path cord]])

pkg/arvo/sur/aquarium.hoon

@@ -19,11 +19,10 @@
   ==
 ::
 +$  unix-event  unix-event:pill-lib
-+$  dawn-event  dawn-event:pill-lib
 +$  pill        pill:pill-lib
 ::
 +$  aqua-event
-  $%  [%init-ship who=ship keys=(unit dawn-event)]
+  $%  [%init-ship who=ship keys=(unit dawn-event:able:jael)]
       [%pause-events who=ship]
       [%snap-ships lab=term hers=(list ship)]
       [%restore-snap lab=term]

pkg/arvo/sys/zuse.hoon

@@ -2072,14 +2072,7 @@
     ::
     +=  task                                            ::  in request ->$
       $~  [%vega ~]                                     ::
-      $%  $:  %dawn                                     ::  boot from keys
-              =seed:able:jael                           ::    identity params
-              spon=(list [=ship point:azimuth-types])   ::
-              czar=(map ship [=rift =life =pass])       ::    galaxy table
-              turf=(list turf)                          ::    domains
-              bloq=@ud                                  ::    block number
-              node=(unit purl:eyre)                     ::    gateway url
-          ==                                            ::
+      $%  [%dawn dawn-event]                            ::  boot from keys
           [%fake =ship]                                 ::  fake boot
           [%listen whos=(set ship) =source]             ::  set ethereum source
           ::TODO  %next for generating/putting new private key
@@ -2095,6 +2088,15 @@
           $>(%west vane-task)                           ::  remote request
       ==                                                ::
     ::
+    +$  dawn-event
+      $:  =seed
+          spon=(list [=ship point:azimuth-types])
+          czar=(map ship [=rift =life =pass])
+          turf=(list turf)
+          bloq=@ud
+          node=(unit purl:eyre)
+      ==
+    ::
     ++  block
       =<  block
       |%