diff options
author | Jade Lovelace <lix@jade.fyi> | 2024-05-24 20:45:06 -0600 |
---|---|---|
committer | Jade Lovelace <lix@jade.fyi> | 2024-06-16 19:15:08 -0700 |
commit | c1f2733dd63eb04a8a192da72835b15f9363869f (patch) | |
tree | a65433f78ddf80a3b5c38413340e0a8c16c8b433 /src/libstore/worker-protocol.cc | |
parent | c22a7f50cb4a476f0c276d8e0d2194da5144ce92 (diff) |
libstore client: remove remaining dead code
Change-Id: I1764b3878439ff7b20ff64bd4efcf03070bb0e5e
Diffstat (limited to 'src/libstore/worker-protocol.cc')
-rw-r--r-- | src/libstore/worker-protocol.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/libstore/worker-protocol.cc b/src/libstore/worker-protocol.cc index d4954aaa8..08c5c6b70 100644 --- a/src/libstore/worker-protocol.cc +++ b/src/libstore/worker-protocol.cc @@ -165,11 +165,11 @@ UnkeyedValidPathInfo WorkerProto::Serialise<UnkeyedValidPathInfo>::read(const St if (deriver != "") info.deriver = store.parseStorePath(deriver); info.references = WorkerProto::Serialise<StorePathSet>::read(store, conn); conn.from >> info.registrationTime >> info.narSize; - if (GET_PROTOCOL_MINOR(conn.version) >= 16) { - conn.from >> info.ultimate; - info.sigs = readStrings<StringSet>(conn.from); - info.ca = ContentAddress::parseOpt(readString(conn.from)); - } + + conn.from >> info.ultimate; + info.sigs = readStrings<StringSet>(conn.from); + info.ca = ContentAddress::parseOpt(readString(conn.from)); + return info; } @@ -180,12 +180,11 @@ void WorkerProto::Serialise<UnkeyedValidPathInfo>::write(const Store & store, Wr << pathInfo.narHash.to_string(Base16, false); WorkerProto::write(store, conn, pathInfo.references); conn.to << pathInfo.registrationTime << pathInfo.narSize; - if (GET_PROTOCOL_MINOR(conn.version) >= 16) { - conn.to - << pathInfo.ultimate - << pathInfo.sigs - << renderContentAddress(pathInfo.ca); - } + + conn.to + << pathInfo.ultimate + << pathInfo.sigs + << renderContentAddress(pathInfo.ca); } } |