daemon: Remove ‘requireSignature’ argument to ‘importPaths’.

For ‘guix-daemon’ the value of ‘requireSignature’ has always been true.

* nix/libstore/store-api.hh (StoreAPI)[importPaths]: Remove ‘requireSignature’
argument.
* nix/libstore/local-store.hh (LocalStore)[importPaths]: Likewise.
* nix/libstore/local-store.cc (LocalStore::importPaths): Adjust accordingly.
* nix/nix-daemon/nix-daemon.cc (performOp): Remove first argument to
‘importPaths’.

Change-Id: I7ed87f3af03cca7078e224788114c499773f01c2
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

4 files changed, 5 insertions, 5 deletions

diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index 478f2ccc44f..3bb96e32601 100644
--- a/nix/libstore/local-store.cc
+++ b/nix/libstore/local-store.cc
@@ -1424,14 +1424,14 @@ Path LocalStore::importPath(bool requireSignature, Source & source)
 }
 
 
-Paths LocalStore::importPaths(bool requireSignature, Source & source)
+Paths LocalStore::importPaths(Source & source)
 {
     Paths res;
     while (true) {
         unsigned long long n = readLongLong(source);
         if (n == 0) break;
         if (n != 1) throw Error("input doesn't look like something created by `nix-store --export'");
-        res.push_back(importPath(requireSignature, source));
+        res.push_back(importPath(true, source));
     }
     return res;
 }
diff --git a/nix/libstore/local-store.hh b/nix/libstore/local-store.hh
index 23af8c3f029..754cdf5ad31 100644
--- a/nix/libstore/local-store.hh
+++ b/nix/libstore/local-store.hh
@@ -108,7 +108,7 @@ public:
     void exportPath(const Path & path, bool sign,
         Sink & sink);
 
-    Paths importPaths(bool requireSignature, Source & source);
+    Paths importPaths(Source & source);
 
     void buildPaths(const PathSet & paths, BuildMode buildMode);
 
diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh
index bc90d145a29..29b33c0be9c 100644
--- a/nix/libstore/store-api.hh
+++ b/nix/libstore/store-api.hh
@@ -214,7 +214,7 @@ public:
 
     /* Import a sequence of NAR dumps created by exportPaths() into
        the Nix store. */
-    virtual Paths importPaths(bool requireSignature, Source & source) = 0;
+    virtual Paths importPaths(Source & source) = 0;
 
     /* For each path, if it's a derivation, build it.  Building a
        derivation means ensuring that the output paths are valid.  If
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index b3cdb699ac2..49172d53e9e 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -480,7 +480,7 @@ static void performOp(bool trusted, unsigned int clientVersion,
 
         /* Unlike Nix, always require a signature, even for "trusted"
            users.  */
-        Paths paths = store->importPaths(true, source);
+        Paths paths = store->importPaths(source);
         stopWork();
         writeStrings(paths, to);
         break;