aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/binary-cache-store.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-04 17:08:30 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-04 17:45:22 +0100
commitaf7cdb1096dd12f0ca06d78f5e5a3f5e9f57b3a8 (patch)
tree1b8ff00a1183f12cd5d8f8b8ea445ec7d34c1d72 /src/libstore/binary-cache-store.cc
parent42bc395b63260e13f42e4bf348823799e78e445f (diff)
BinaryCacheStore: Remove publicKeyFile argument
The public key can be derived from the secret key, so there's no need for the user to supply it separately.
Diffstat (limited to 'src/libstore/binary-cache-store.cc')
-rw-r--r--src/libstore/binary-cache-store.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index 01d937f2e..5ded16d02 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -14,16 +14,13 @@
namespace nix {
BinaryCacheStore::BinaryCacheStore(std::shared_ptr<Store> localStore,
- const Path & secretKeyFile, const Path & publicKeyFile)
+ const Path & secretKeyFile)
: localStore(localStore)
{
- if (secretKeyFile != "")
+ if (secretKeyFile != "") {
secretKey = std::unique_ptr<SecretKey>(new SecretKey(readFile(secretKeyFile)));
-
- if (publicKeyFile != "") {
publicKeys = std::unique_ptr<PublicKeys>(new PublicKeys);
- auto key = PublicKey(readFile(publicKeyFile));
- publicKeys->emplace(key.name, key);
+ publicKeys->emplace(secretKey->name, secretKey->toPublicKey());
}
StringSink sink;