diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-08-09T04·27-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-08-09T17·26+0000 |
| commit | d1653533a6f6f70d1d95001abf3f80665ba135e7 (patch) | |
| tree | 35c29ccb38f404848eec2969862c6bd0f0671b43 /third_party/nix/src/libstore | |
| parent | dfab786653c24b11a8e9338df29c22fd7a0c4959 (diff) | |
test(tvix): Cover scanForReferences in a test r/1627
Aded a few test cases covering the scanForReferences function, which had been accidentally broken in 976a36c (which is now partially-reverted). As part of this, since the test needed to generate hashes for store paths, the logic in MakeStorePath to compress a sha256 hash down to 20 bytes and convert it to base32 has been extracted to a member function on the Hash class. Fixes: #34 Change-Id: Ie2d914688a80f42d0234d351a7cc0714fd15709e Reviewed-on: https://cl.tvl.fyi/c/depot/+/1698 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party/nix/src/libstore')
| -rw-r--r-- | third_party/nix/src/libstore/store-api.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/store-api.cc b/third_party/nix/src/libstore/store-api.cc index a6863cc04b..ae403b0be6 100644 --- a/third_party/nix/src/libstore/store-api.cc +++ b/third_party/nix/src/libstore/store-api.cc @@ -323,9 +323,8 @@ Path Store::makeStorePath(const std::string& type, const Hash& hash, checkStoreName(name); - return storeDir + "/" + - compressHash(hashString(htSHA256, s), 20).to_string(Base32, false) + - "-" + name; + return absl::StrCat(storeDir, "/", hashString(htSHA256, s).ToStorePathHash(), + "-", name); } Path Store::makeOutputPath(const std::string& id, const Hash& hash, |