wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Factor out UnkeyedValidPathInfo and test

Browse source 
This makes the path info serialisers ideomatic again, which allows me to
test them.
This commit is contained in:
John Ericson 2023-04-17 17:13:44 -04:00
parent 596bd469cc
commit 70f8b96c11
10 changed files with 218 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libstore/worker-protocol.hh
View file

@ -32,6 +32,7 @@ struct DerivedPath;
struct BuildResult;
struct KeyedBuildResult;
struct ValidPathInfo;
struct UnkeyedValidPathInfo;
enum TrustedFlag : bool;
@ -207,6 +208,10 @@ DECLARE_WORKER_SERIALISER(BuildResult);
template<>
DECLARE_WORKER_SERIALISER(KeyedBuildResult);
template<>
DECLARE_WORKER_SERIALISER(ValidPathInfo);
template<>
DECLARE_WORKER_SERIALISER(UnkeyedValidPathInfo);
template<>
DECLARE_WORKER_SERIALISER(std::optional<TrustedFlag>);
template<typename T>
@ -221,15 +226,4 @@ template<typename K, typename V>
DECLARE_WORKER_SERIALISER(std::map<K COMMA_ V>);
#undef COMMA_
/* These are a non-standard form for historical reasons. */
template<>
struct WorkerProto::Serialise<ValidPathInfo>
{
static ValidPathInfo read(const Store & store, WorkerProto::ReadConn conn);
static ValidPathInfo read(const Store & store, WorkerProto::ReadConn conn, StorePath && path);
static void write(const Store & store, WriteConn conn, const ValidPathInfo & pathInfo, bool includePath = true);
};
}