Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make ValidPath (nar) hash optional if ca field is present #4059

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

Make ValidPath (nar) hash optional if ca field is present #4059

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
49bcf8b
Create the These datatype
meditans Aug 19, 2020
aff50aa
Introduce hashOrContentAddress and fix init
meditans Aug 19, 2020
57fc85a
Introduce These and ContentAddresses in path-info
meditans Aug 26, 2020
c0f08bf
Introduce viewHashResult and viewCA
meditans Aug 26, 2020
6c8cf7b
Use the new more explicative names
meditans Aug 26, 2020
fd19dc4
Correct segmentation fault bug
meditans Aug 26, 2020
961be90
Clean up some things but not tests fixed yet
Ericson2314 Aug 26, 2020
31197bb
Try to be much more explicit about asserting nar size and hash
Ericson2314 Aug 27, 2020
6c5827c
Don't dereference `maintainExpectedNar` uncondititonally
Ericson2314 Aug 27, 2020
014348f
Merge remote-tracking branch 'upstream/master' into unified-contentAd…
Ericson2314 Sep 24, 2020
7bf6cdb
Fix and outline some comparison operators
Ericson2314 Sep 9, 2020
f7d2556
Add the missing return
Ericson2314 Sep 24, 2020
09ad35b
Try to fix Perl bindings
Ericson2314 Sep 24, 2020
bf27d32
Fix typo in perl Bindings
Ericson2314 Sep 24, 2020
04ecf5c
Fix narSize usage in Perl bindings too
Ericson2314 Sep 24, 2020
b446e53
Merge remote-tracking branch 'upstream/master' into unified-contentAd…
Ericson2314 Oct 12, 2020
0b38ac1
tabs -> spaces
Ericson2314 Oct 12, 2020
1df32da
Merge remote-tracking branch 'upstream/master' into unified-contentAd…
Ericson2314 Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Introduce hashOrContentAddress and fix init
  • Loading branch information
@meditans
meditans committed Aug 19, 2020
commit aff50aa88b45dd0a9beeb14a3c12ab448eb15d6b
7 changes: 5 additions & 2 deletions src/libstore/path-info.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ struct ValidPathInfo
StorePath path;
std::optional<StorePath> deriver;
// TODO document this
These<Hash, ContentAddress> hashOrContentAddress;
Hash narHash;
StorePathSet references;
time_t registrationTime = 0;
Expand Down Expand Up @@ -102,8 +103,10 @@ struct ValidPathInfo

ValidPathInfo(const ValidPathInfo & other) = default;

ValidPathInfo(StorePath && path, Hash narHash) : path(std::move(path)), narHash(narHash) { };
ValidPathInfo(const StorePath & path, Hash narHash) : path(path), narHash(narHash) { };
ValidPathInfo(StorePath && path, Hash narHash)
: path(std::move(path)), hashOrContentAddress(narHash), narHash(narHash) { };
ValidPathInfo(const StorePath & path, Hash narHash)
: path(path), hashOrContentAddress(narHash), narHash(narHash) { };

virtual ~ValidPathInfo() { }
};
Expand Down