From b8525c7915bdf3a42bca88df18500cc9a5884ffc Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Mon, 1 Jun 2020 14:28:05 -0400
Subject: [PATCH] file-server: fix issues from merge

---
 pkg/arvo/app/file-server.hoon | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/arvo/app/file-server.hoon b/pkg/arvo/app/file-server.hoon
index a39dc87eb..c20ce198f 100644
--- a/pkg/arvo/app/file-server.hoon
+++ b/pkg/arvo/app/file-server.hoon
@@ -1,4 +1,4 @@
-/-  *file-server
+/-  srv=file-server
 /+  *server, default-agent, verb, dbug
 |%
 +$  card  card:agent:gall
@@ -9,12 +9,14 @@
 +$  serving  (map url-base=path [clay-base=path public=?])
 +$  state-zero
   $:  %0
-      =configuration
+      =configuration:srv
       =serving
   ==
 --
+::
 %+  verb  |
 %-  agent:dbug
+::
 =|  state-zero
 =*  state  -
 ^-  agent:gall
@@ -55,7 +57,7 @@
   |^
   ?>  (team:title our.bowl src.bowl)
   ?+  mark  (on-poke:def mark vase)
-      %file-server-action  (file-server-action !<(action vase))
+      %file-server-action  (file-server-action !<(action:srv vase))
       %handle-http-request
     =+  !<([id=@ta req=inbound-request:eyre] vase)
     :_  this
@@ -64,7 +66,7 @@
   ==
   ::
   ++  file-server-action
-    |=  act=action
+    |=  act=action:srv
     ^-  (quip card _this)
     |^
     ?-  -.act
@@ -93,7 +95,7 @@
     ==
     ::
     ++  give
-      |=  =update
+      |=  =update:srv
       ^-  (list card)
       [%give %fact [/all]~ [%file-server-update !>(update)]]~
     --
@@ -194,7 +196,7 @@
   ==
   ::
    ++  give
-    |=  =update
+    |=  =update:srv
     ^-  (list card)
     [%give %fact ~ [%file-server-update !>(update)]]~
   --