From 0251b127e194cdc01bdd2a4460f9788c3f1eb2cf Mon Sep 17 00:00:00 2001
From: fang <git@fang.io>
Date: Thu, 12 May 2022 17:14:55 +0200
Subject: [PATCH] clay: request files over scry by tako, not aeon

---
 pkg/arvo/sys/vane/clay.hoon | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index e98427dc3..bfaf284b5 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -325,7 +325,7 @@
       =rave
       scry=(unit @da)                                   ::  if scry, timeout
       have=(map lobe fell)
-      need=(list $@(lobe [=aeon =path =lobe]))          ::  opt deets for scry
+      need=(list $@(lobe [=tako =path =lobe]))          ::  opt deets for scry
       nako=(qeu (unit nako))
       busy=_|
   ==
@@ -3284,15 +3284,15 @@
     ++  missing-lobes
       |=  =nako
       =|  miss=(set lobe)
-      ^-  (list [aeon path lobe])
+      ^-  (list [tako path lobe])
       =/  yakis  ~(tap in lar.nako)
-      |-  ^-  (list [aeon path lobe])
+      |-  ^-  (list [tako path lobe])
       =*  yaki-loop  $
       ?~  yakis
         ~
       =/  =norm  (~(gut by tom.dom) r.i.yakis nor.dom)
       =/  lobes=(list [=path =lobe])  ~(tap by q.i.yakis)
-      |-  ^-  (list [aeon path lobe])
+      |-  ^-  (list [tako path lobe])
       =*  blob-loop  $
       ?~  lobes
         yaki-loop(yakis t.yakis)
@@ -3302,16 +3302,8 @@
               (~(has in miss) lobe)
           ==
         blob-loop(lobes t.lobes)
-      =;  =aeon
-        :-  [aeon i.lobes]
-        blob-loop(lobes t.lobes, miss (~(put in miss) lobe))
-      ::  find the aeon corresponding to the commit containing this lobe.
-      ::  we unfortunately do not have a reverse lookup map.
-      ::
-      =/  l=(list [a=aeon t=tako])  ~(tap by gar.nako)
-      |-
-      ?~  l  ~|([%missing-aeon-for-tako her syd `@uw`r.i.yakis] !!)
-      ?:(=(r.i.yakis t.i.l) a.i.l $(l t.l))
+      :-  [r.i.yakis i.lobes]
+      blob-loop(lobes t.lobes, miss (~(put in miss) lobe))
     ::
     ::  Receive backfill response
     ::
@@ -3373,7 +3365,7 @@
           ::  make the request over remote scry
           ::
           =/  =mood
-            [%x ud+aeon path]:i.need.sat
+            [%x uv+tako path]:i.need.sat
           [`- +]:(send-over-scry %back-index hen her inx syd mood)
         ::  otherwise, request over ames
         ::
@@ -4938,7 +4930,7 @@
           %=    update-state-10
               |2
             :-  `(unit @da)`~
-            ^-  [(map lobe fell) (list $@(lobe [aeon path lobe])) (qeu (unit nako)) _|]
+            ^-  [(map lobe fell) (list $@(lobe [tako path lobe])) (qeu (unit nako)) _|]
             %=    |2.update-state-10
                 nako
               %-  ~(gas to *(qeu (unit nako)))