From 8e3ada2afcc2dd5153d3ae162afbb0633a570285 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.helbling@determinate.systems>
Date: Mon, 28 Mar 2022 09:26:28 -0700
Subject: [PATCH] Revert "Use `copyClosure` instead of `computeFSClosure` +
 `copyPaths`"

This reverts commit f14c583ce5188903f7c9db6f99c8c3fb42c77416.
---
 src/hydra-queue-runner/build-remote.cc  | 6 +++---
 src/hydra-queue-runner/queue-monitor.cc | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index 69c82e72..464a35c8 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -287,9 +287,9 @@ void State::buildRemote(ref<Store> destStore,
            this will copy the inputs to the binary cache from the local
            store. */
         if (localStore != std::shared_ptr<Store>(destStore)) {
-            copyClosure(*localStore, *destStore,
-                step->drv->inputSrcs,
-                NoRepair, NoCheckSigs, NoSubstitute);
+            StorePathSet closure;
+            localStore->computeFSClosure(step->drv->inputSrcs, closure);
+            copyPaths(*localStore, *destStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
         }
 
         {
diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc
index 3f19d36a..49caf8e3 100644
--- a/src/hydra-queue-runner/queue-monitor.cc
+++ b/src/hydra-queue-runner/queue-monitor.cc
@@ -513,9 +513,9 @@ Step::ptr State::createStep(ref<Store> destStore,
                         // FIXME: should copy directly from substituter to destStore.
                     }
 
-                    copyClosure(*localStore, *destStore,
-                        StorePathSet { *path },
-                        NoRepair, CheckSigs, NoSubstitute);
+                    StorePathSet closure;
+                    localStore->computeFSClosure({*path}, closure);
+                    copyPaths(*localStore, *destStore, closure, NoRepair, CheckSigs, NoSubstitute);
 
                     time_t stopTime = time(0);