From 8983ee8b2e0c10e6cac672a5a7ada4698235a62e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 17 Jan 2024 17:54:03 +0100
Subject: [PATCH] refactor: Un-callback transform
 Store::queryPathInfoFromClientCache

This part of the code was not necessarily callback based.
Removing CPS is always nice; particularly if there's no loss of
functionality, like here.
---
 src/libstore/store-api.cc | 18 +++++++++---------
 src/libstore/store-api.hh |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 66bc95625..f237578e5 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -685,8 +685,7 @@ static bool goodStorePath(const StorePath & expected, const StorePath & actual)
         && (expected.name() == Store::MissingName || expected.name() == actual.name());
 }
 
-bool Store::queryPathInfoFromClientCache(const StorePath & storePath,
-    Callback<ref<const ValidPathInfo>> & callback)
+std::optional<ref<const ValidPathInfo>> Store::queryPathInfoFromClientCache(const StorePath & storePath)
 {
     auto hashPart = std::string(storePath.hashPart());
 
@@ -696,8 +695,7 @@ bool Store::queryPathInfoFromClientCache(const StorePath & storePath,
             stats.narInfoReadAverted++;
             if (!res->didExist())
                 throw InvalidPath("path '%s' is not valid", printStorePath(storePath));
-            callback(ref<const ValidPathInfo>(res->value));
-            return true;
+            return ref(res->value);
         }
     }
 
@@ -713,12 +711,11 @@ bool Store::queryPathInfoFromClientCache(const StorePath & storePath,
                     !goodStorePath(storePath, res.second->path))
                     throw InvalidPath("path '%s' is not valid", printStorePath(storePath));
             }
-            callback(ref<const ValidPathInfo>(res.second));
-            return true;
+            return ref(res.second);
         }
     }
 
-    return false;
+    return std::nullopt;
 }
 
 
@@ -728,8 +725,11 @@ void Store::queryPathInfo(const StorePath & storePath,
     auto hashPart = std::string(storePath.hashPart());
 
     try {
-        if (queryPathInfoFromClientCache(storePath, callback))
-            return;
+        auto r = queryPathInfoFromClientCache(storePath);
+        if (r.has_value()) {
+            ref<const ValidPathInfo> & info = *r;
+            return callback(ref(info));
+        }
     } catch (...) { return callback.rethrow(); }
 
     auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 2a1092d9e..e47f2c768 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -285,14 +285,14 @@ public:
     /**
      * NOTE: this is not the final interface - to be modified in next commit.
      *
-     * Asynchronous version that only queries the local narinfo cache and not
+     * Version of queryPathInfo() that only queries the local narinfo cache and not
      * the actual store.
      *
-     * @return true if the path was known and the callback invoked
-     * @return false if the path was not known and the callback not invoked
+     * @return `std::make_optional(vpi)` if the path is known
+     * @return `std::null_opt` if the path was not known to be valid or invalid
      * @throw InvalidPathError if the path is known to be invalid
      */
-    bool queryPathInfoFromClientCache(const StorePath & path, Callback<ref<const ValidPathInfo>> & callback);
+    std::optional<ref<const ValidPathInfo>> queryPathInfoFromClientCache(const StorePath & path);
 
     /**
      * Query the information about a realisation.