Merge remote-tracking branch 'obsidian/validPathInfo-ca-proper-dataty…

…pe' into ipfs-develop
Ericson2314 · Jun 19, 2020 · 8e6f79b · 8e6f79b
2 parents 568d6da + e288c09
commit 8e6f79b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
@@ -71,8 +71,8 @@ DownloadFileResult downloadFile(
         info.narHash = hashString(htSHA256, *sink.s);
         info.narSize = sink.s->size();
         info.ca = FixedOutputHash {
-            FileIngestionMethod::Flat,
-            hash,
+            .method = FileIngestionMethod::Flat,
+            .hash = hash,
         };
         auto source = StringSource { *sink.s };
         store->addToStore(info, source, NoRepair, NoCheckSigs);

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
@@ -3764,7 +3764,10 @@ void DerivationGoal::registerOutputs()
             else
                 assert(worker.store.parseStorePath(path) == dest);
 
-            ca = FixedOutputHash { i.second.hash->method, h2 };
+            ca = FixedOutputHash {
+                .method = i.second.hash->method,
+                .hash = h2,
+            };
         }
 
         /* Get rid of all weird permissions.  This also checks that

diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc
@@ -56,13 +56,22 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
             auto methodAndHash = rawCa.substr(prefixSeparator+1, string::npos);
             if (methodAndHash.substr(0, 2) == "r:") {
                 std::string_view hashRaw = methodAndHash.substr(2, string::npos);
-                return FixedOutputHash { FileIngestionMethod::Recursive, Hash(string(hashRaw)) };
+                return FixedOutputHash {
+                    .method = FileIngestionMethod::Recursive,
+                    .hash = Hash(string(hashRaw)),
+                };
             } else if (methodAndHash.substr(0, 4) == "git:") {
                 std::string_view hashRaw = methodAndHash.substr(4, string::npos);
-                return FixedOutputHash { FileIngestionMethod::Git, Hash(string(hashRaw)) };
+                return FixedOutputHash {
+                    .method = FileIngestionMethod::Git,
+                    .hash = Hash(string(hashRaw)),
+                };
             } else {
                 std::string_view hashRaw = methodAndHash;
-                return FixedOutputHash { FileIngestionMethod::Flat, Hash(string(hashRaw)) };
+                return FixedOutputHash {
+                    .method = FileIngestionMethod::Flat,
+                    .hash = Hash(string(hashRaw)),
+                };
             }
         } else {
             throw Error("parseContentAddress: format not recognized; has to be text or fixed");

diff --git a/src/libstore/content-address.hh b/src/libstore/content-address.hh
@@ -14,22 +14,12 @@ enum struct FileIngestionMethod : uint8_t {
 
 struct TextHash {
     Hash hash;
-    TextHash(const TextHash &) = default;
-    TextHash(TextHash &&) = default;
-    TextHash & operator = (const TextHash &) = default;
 };
 
 /// Pair of a hash, and how the file system was ingested
 struct FixedOutputHash {
     FileIngestionMethod method;
     Hash hash;
-    FixedOutputHash(FileIngestionMethod method, Hash hash)
-        : method(std::move(method))
-        , hash(std::move(hash))
-    { }
-    FixedOutputHash(const FixedOutputHash &) = default;
-    FixedOutputHash(FixedOutputHash &&) = default;
-    FixedOutputHash & operator = (const FixedOutputHash &) = default;
     std::string printMethodAlgo() const;
 };
 

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
@@ -1097,7 +1097,7 @@ StorePath LocalStore::addToStoreFromDump(const string & dump, const string & nam
             ValidPathInfo info(dstPath);
             info.narHash = hash.first;
             info.narSize = hash.second;
-            info.ca = FixedOutputHash { method, h };
+            info.ca = FixedOutputHash { .method = method, .hash = h };
             registerValidPath(info);
         }
 

diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
@@ -59,7 +59,10 @@ struct CmdAddToStore : MixDryRun, StoreCommand
         ValidPathInfo info(store->makeFixedOutputPath(ingestionMethod, hash, *namePart));
         info.narHash = narHash;
         info.narSize = sink.s->size();
-        info.ca = FixedOutputHash { ingestionMethod, hash };
+        info.ca = std::optional { FixedOutputHash {
+            .method = ingestionMethod,
+            .hash = info.narHash,
+        } };
 
         if (!dryRun) {
             auto addedPath = store->addToStore(*namePart, path, ingestionMethod, git ? htSHA1 : htSHA256);

diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressable.cc
@@ -83,8 +83,8 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
             info.narHash = narHash;
             info.narSize = sink.s->size();
             info.ca = FixedOutputHash {
-                FileIngestionMethod::Recursive,
-                info.narHash,
+                .method = FileIngestionMethod::Recursive,
+                .hash = info.narHash,
             };
 
             if (!json)