From d0d3b0a2986915ab7aa96d3fce8371a5012c9021 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 7 Dec 2023 14:13:06 -0500
Subject: [PATCH] Use `ServeProto::Serialise<UnkeyedValidPathInfo>` for
`QueryValidPaths`
Companion to already-merged https://github.com/NixOS/nix/pull/9560
---
src/hydra-queue-runner/build-remote.cc | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index 62d321bb..5818727b 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -338,23 +338,10 @@ static std::map<StorePath, UnkeyedValidPathInfo> queryPathInfos(
while (true) {
auto storePathS = readString(conn.from);
if (storePathS == "") break;
- auto deriver = readString(conn.from); // deriver
- auto references = ServeProto::Serialise<StorePathSet>::read(localStore, conn);
- readLongLong(conn.from); // download size
- auto narSize = readLongLong(conn.from);
- auto narHash = Hash::parseAny(readString(conn.from), HashAlgorithm::SHA256);
- auto ca = ContentAddress::parseOpt(readString(conn.from));
- readStrings<StringSet>(conn.from); // sigs
- ValidPathInfo info(localStore.parseStorePath(storePathS), narHash);
- assert(outputs.count(info.path));
- info.references = references;
- info.narSize = narSize;
- totalNarSize += info.narSize;
- info.narHash = narHash;
- info.ca = ca;
- if (deriver != "")
- info.deriver = localStore.parseStorePath(deriver);
- infos.insert_or_assign(info.path, info);
+
+ auto storePath = localStore.parseStorePath(storePathS);
+ auto info = ServeProto::Serialise<UnkeyedValidPathInfo>::read(localStore, conn);
+ infos.insert_or_assign(storePath, info);
}
return infos;