various: fix merge problems

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42b81ff30114d982a485d851879bd3f4abbfaa6272351eaca717e10370af293e
-size 13645079
+oid sha256:8cf44c75799cbad5d8c56913634e35e481cb40baa18a8c31b0702165e1e7d6a0
+size 13753702

pkg/arvo/app/hood.hoon

@@ -1,10 +1,22 @@
 /+  default-agent
 /+  drum=hood-drum, helm=hood-helm, kiln=hood-kiln
 |%
-+$  state  [%16 any-state-tuple]
++$  state
+  $~  [%16 *state:drum *state:helm *state:kiln]
+  $>(%16 any-state)
+::
 +$  any-state
   $%  [ver=?(%1 %2 %3 %4 %5 %6) lac=(map @tas fin-any-state)]
-      [ver=?(%7 %8 %9 %10 %11 %12 %13 %14 %15 %16) any-state-tuple]
+      [%7 drum=state-2:drum helm=state:helm kiln=state-0:kiln]
+      [%8 drum=state-2:drum helm=state:helm kiln=state-0:kiln]
+      [%9 drum=state-2:drum helm=state:helm kiln=state-0:kiln]
+      [%10 drum=state-2:drum helm=state:helm kiln=state-0:kiln]
+      [%11 drum=state-2:drum helm=state:helm kiln=state-0:kiln]
+      [%12 drum=state-2:drum helm=state:helm kiln=state-0:kiln]
+      [%13 drum=state-2:drum helm=state:helm kiln=state-1:kiln]
+      [%14 drum=state-3:drum helm=state:helm kiln=state-1:kiln]
+      [%15 drum=state-3:drum helm=state:helm kiln=state-2:kiln]
+      [%16 drum=state-4:drum helm=state:helm kiln=state-3:kiln]
   ==
 +$  any-state-tuple
   $:  drum=any-state:drum
@@ -55,9 +67,9 @@
           =-(?>(?=(%kiln -<) ->) (~(got by lac.old) %kiln))
       ==
     ==
-  =^  d  drum.state  (on-load:drum-core -.old drum.tup)
-  =^  h  helm.state  (on-load:helm-core -.old helm.tup)
-  =^  k  kiln.state  (on-load:kiln-core -.old kiln.tup)
+  =^  d  drum.state  (on-load:(drum bowl *state:drum) -.old drum.tup)
+  =^  h  helm.state  (on-load:(helm bowl *state:helm) -.old helm.tup)
+  =^  k  kiln.state  (on-load:(kiln bowl *state:kiln) -.old kiln.tup)
   [:(welp d h k) this]
 ::
 ++  on-poke

pkg/arvo/lib/hood/drum.hoon

@@ -81,8 +81,7 @@
 --
 ::  TODO: remove .ost
 ::
-|=  [hid=bowl:gall any-state]
-?>  ?=(%4 +<+<)
+|=  [hid=bowl:gall state]
 =*  sat  +<+
 =/  ost  0
 =+  (~(gut by bin) ost *source)

pkg/arvo/lib/hood/helm.hoon

@@ -23,8 +23,7 @@
   ^-  state
   [%1 mass-timer:(~(got by hoc.s) 0)]
 --
-|=  [=bowl:gall sat=any-state]
-?>  ?=(%1 -.sat)
+|=  [=bowl:gall sat=state]
 =|  moz=(list card)
 |%
 ++  this  .

pkg/arvo/lib/hood/kiln.hoon

@@ -116,8 +116,7 @@
 ::
 +$  kiln-fuse-list  (unit desk)
 --
-|=  [bowl:gall any-state]
-?>  ?=(%3 +<+<)
+|=  [bowl:gall state]
 ?>  =(src our)
 =|  moz=(list card:agent:gall)
 |%

pkg/landscape/app/observe-hook.hoon

@@ -276,7 +276,7 @@
     :_  this(static-conversions (~(put in static-conversions) [from to]))
     =/  =wire  /static-convert/[from]/[to]
     =/  =rave:clay  [%sing %f [%da now.bowl] /[from]/[to]]
-    [%pass wire %arvo %c %warp our.bowl %home `rave]~
+    [%pass wire %arvo %c %warp our.bowl desk `rave]~
   ::
   ++  cool-static-conversion
     |=  [from=term to=term]