From 2df2741ec6e9411739b2049d7487b7b8a26d4547 Mon Sep 17 00:00:00 2001
From: Nikola Knezevic <nikola@knezevic.ch>
Date: Mon, 6 Apr 2020 15:37:33 +0200
Subject: [PATCH] enqueueDownload -> enqueueDataTransfer

---
 src/libstore/datatransfer.cc            | 10 +++++-----
 src/libstore/datatransfer.hh            |  4 ++--
 src/libstore/http-binary-cache-store.cc |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libstore/datatransfer.cc b/src/libstore/datatransfer.cc
index 06aa86d97..9475c24ec 100644
--- a/src/libstore/datatransfer.cc
+++ b/src/libstore/datatransfer.cc
@@ -641,7 +641,7 @@ struct CurlDownloader : public Downloader
     }
 #endif
 
-    void enqueueDownload(const DataTransferRequest & request,
+    void enqueueDataTransfer(const DataTransferRequest & request,
         Callback<DataTransferResult> callback) override
     {
         /* Ugly hack to support s3:// URIs. */
@@ -687,10 +687,10 @@ ref<Downloader> makeDownloader()
     return make_ref<CurlDownloader>();
 }
 
-std::future<DataTransferResult> Downloader::enqueueDownload(const DataTransferRequest & request)
+std::future<DataTransferResult> Downloader::enqueueDataTransfer(const DataTransferRequest & request)
 {
     auto promise = std::make_shared<std::promise<DataTransferResult>>();
-    enqueueDownload(request,
+    enqueueDataTransfer(request,
         {[promise](std::future<DataTransferResult> fut) {
             try {
                 promise->set_value(fut.get());
@@ -703,7 +703,7 @@ std::future<DataTransferResult> Downloader::enqueueDownload(const DataTransferRe
 
 DataTransferResult Downloader::download(const DataTransferRequest & request)
 {
-    return enqueueDownload(request).get();
+    return enqueueDataTransfer(request).get();
 }
 
 void Downloader::download(DataTransferRequest && request, Sink & sink)
@@ -755,7 +755,7 @@ void Downloader::download(DataTransferRequest && request, Sink & sink)
         state->avail.notify_one();
     };
 
-    enqueueDownload(request,
+    enqueueDataTransfer(request,
         {[_state](std::future<DataTransferResult> fut) {
             auto state(_state->lock());
             state->quit = true;
diff --git a/src/libstore/datatransfer.hh b/src/libstore/datatransfer.hh
index b9e55655f..53159bdb4 100644
--- a/src/libstore/datatransfer.hh
+++ b/src/libstore/datatransfer.hh
@@ -74,10 +74,10 @@ struct Downloader
     /* Enqueue a download request, returning a future to the result of
        the download. The future may throw a DownloadError
        exception. */
-    virtual void enqueueDownload(const DataTransferRequest & request,
+    virtual void enqueueDataTransfer(const DataTransferRequest & request,
         Callback<DataTransferResult> callback) = 0;
 
-    std::future<DataTransferResult> enqueueDownload(const DataTransferRequest & request);
+    std::future<DataTransferResult> enqueueDataTransfer(const DataTransferRequest & request);
 
     /* Synchronously download a file. */
     DataTransferResult download(const DataTransferRequest & request);
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index 24a98d073..861287a33 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -142,7 +142,7 @@ protected:
 
         auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));
 
-        getDownloader()->enqueueDownload(request,
+        getDownloader()->enqueueDataTransfer(request,
             {[callbackPtr, this](std::future<DataTransferResult> result) {
                 try {
                     (*callbackPtr)(result.get().data);