Remove support for daemon protocol version < 18

Version 18 was introduced in November 2016 (4b8f1b0ec0).

src/libstore/daemon.cc

@@ -572,7 +572,6 @@ static void performOp(
     case WorkerProto::Op::BuildPaths: {
         auto drvs = WorkerProto::Serialise<DerivedPaths>::read(*store, rconn);
         BuildMode mode = bmNormal;
-        if (GET_PROTOCOL_MINOR(conn.protoVersion) >= 15) {
         mode = WorkerProto::Serialise<BuildMode>::read(*store, rconn);
 
         /* Repairing is not atomic, so disallowed for "untrusted"
@@ -586,7 +585,6 @@ static void performOp(
           */
         if (mode == bmRepair && !trusted)
             throw Error("repairing is not allowed because you are not in 'trusted-users'");
-        }
         logger->startWork();
         store->buildPaths(drvs, mode);
         logger->stopWork();
@@ -805,14 +803,12 @@ static void performOp(
         clientSettings.buildCores = readInt(conn.from);
         clientSettings.useSubstitutes = readInt(conn.from);
 
-        if (GET_PROTOCOL_MINOR(conn.protoVersion) >= 12) {
         unsigned int n = readInt(conn.from);
         for (unsigned int i = 0; i < n; i++) {
             auto name = readString(conn.from);
             auto value = readString(conn.from);
             clientSettings.overrides.emplace(name, value);
         }
-        }
 
         logger->startWork();
 
@@ -876,19 +872,12 @@ static void performOp(
         auto path = store->parseStorePath(readString(conn.from));
         std::shared_ptr<const ValidPathInfo> info;
         logger->startWork();
-        try {
         info = store->queryPathInfo(path);
-        } catch (InvalidPath &) {
-            if (GET_PROTOCOL_MINOR(conn.protoVersion) < 17)
-                throw;
-        }
         logger->stopWork();
         if (info) {
-            if (GET_PROTOCOL_MINOR(conn.protoVersion) >= 17)
             conn.to << 1;
             WorkerProto::write(*store, wconn, static_cast<const UnkeyedValidPathInfo &>(*info));
         } else {
-            assert(GET_PROTOCOL_MINOR(conn.protoVersion) >= 17);
             conn.to << 0;
         }
         break;
@@ -1063,7 +1052,7 @@ void processConnection(ref<Store> store, FdSource && from, FdSink && to, Trusted
     auto [protoVersion, features] =
         WorkerProto::BasicServerConnection::handshake(to, from, PROTOCOL_VERSION, WorkerProto::allFeatures);
 
-    if (protoVersion < 0x10a)
+    if (protoVersion < 256 + 18)
         throw Error("the Nix client version is too old");
 
     WorkerProto::BasicServerConnection conn;

src/libstore/remote-store.cc

@@ -73,6 +73,8 @@ void RemoteStore::initConnection(Connection & conn)
         try {
             auto [protoVersion, features] =
                 WorkerProto::BasicClientConnection::handshake(conn.to, tee, PROTOCOL_VERSION, WorkerProto::allFeatures);
+            if (protoVersion < 256 + 18)
+                throw Error("the Nix daemon version is too old");
             conn.protoVersion = protoVersion;
             conn.features = features;
         } catch (SerialisationError & e) {
@@ -109,7 +111,6 @@ void RemoteStore::setOptions(Connection & conn)
             << 0                                                  /* obsolete print build trace */
             << settings.buildCores << settings.useSubstitutes;
 
-    if (GET_PROTOCOL_MINOR(conn.protoVersion) >= 12) {
     std::map<std::string, nix::Config::SettingInfo> overrides;
     settings.getSettings(overrides, true); // libstore settings
     fileTransferSettings.getSettings(overrides, true);
@@ -126,7 +127,6 @@ void RemoteStore::setOptions(Connection & conn)
     conn.to << overrides.size();
     for (auto & i : overrides)
         conn.to << i.first << i.second.value;
-    }
 
     auto ex = conn.processStderrReturn();
     if (ex)
@@ -167,16 +167,8 @@ bool RemoteStore::isValidPathUncached(const StorePath & path)
 StorePathSet RemoteStore::queryValidPaths(const StorePathSet & paths, SubstituteFlag maybeSubstitute)
 {
     auto conn(getConnection());
-    if (GET_PROTOCOL_MINOR(conn->protoVersion) < 12) {
-        StorePathSet res;
-        for (auto & i : paths)
-            if (isValidPath(i))
-                res.insert(i);
-        return res;
-    } else {
     return conn->queryValidPaths(*this, &conn.daemonException, paths, maybeSubstitute);
 }
-}
 
 StorePathSet RemoteStore::queryAllValidPaths()
 {
@@ -189,22 +181,11 @@ StorePathSet RemoteStore::queryAllValidPaths()
 StorePathSet RemoteStore::querySubstitutablePaths(const StorePathSet & paths)
 {
     auto conn(getConnection());
-    if (GET_PROTOCOL_MINOR(conn->protoVersion) < 12) {
-        StorePathSet res;
-        for (auto & i : paths) {
-            conn->to << WorkerProto::Op::HasSubstitutes << printStorePath(i);
-            conn.processStderr();
-            if (readInt(conn->from))
-                res.insert(i);
-        }
-        return res;
-    } else {
     conn->to << WorkerProto::Op::QuerySubstitutablePaths;
     WorkerProto::write(*this, *conn, paths);
     conn.processStderr();
     return WorkerProto::Serialise<StorePathSet>::read(*this, *conn);
 }
-}
 
 void RemoteStore::querySubstitutablePathInfos(const StorePathCAMap & pathsMap, SubstitutablePathInfos & infos)
 {
@@ -213,26 +194,6 @@ void RemoteStore::querySubstitutablePathInfos(const StorePathCAMap & pathsMap, S
 
     auto conn(getConnection());
 
-    if (GET_PROTOCOL_MINOR(conn->protoVersion) < 12) {
-
-        for (auto & i : pathsMap) {
-            SubstitutablePathInfo info;
-            conn->to << WorkerProto::Op::QuerySubstitutablePathInfo << printStorePath(i.first);
-            conn.processStderr();
-            unsigned int reply = readInt(conn->from);
-            if (reply == 0)
-                continue;
-            auto deriver = readString(conn->from);
-            if (deriver != "")
-                info.deriver = parseStorePath(deriver);
-            info.references = WorkerProto::Serialise<StorePathSet>::read(*this, *conn);
-            info.downloadSize = readLongLong(conn->from);
-            info.narSize = readLongLong(conn->from);
-            infos.insert_or_assign(i.first, std::move(info));
-        }
-
-    } else {
-
     conn->to << WorkerProto::Op::QuerySubstitutablePathInfos;
     if (GET_PROTOCOL_MINOR(conn->protoVersion) < 22) {
         StorePathSet paths;
@@ -253,7 +214,6 @@ void RemoteStore::querySubstitutablePathInfos(const StorePathCAMap & pathsMap, S
         info.narSize = readLongLong(conn->from);
     }
 }
-}
 
 void RemoteStore::queryPathInfoUncached(
     const StorePath & path, Callback<std::shared_ptr<const ValidPathInfo>> callback) noexcept
@@ -466,21 +426,6 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source, Repair
 {
     auto conn(getConnection());
 
-    if (GET_PROTOCOL_MINOR(conn->protoVersion) < 18) {
-        auto source2 = sinkToSource([&](Sink & sink) {
-            sink << 1 // == path follows
-                ;
-            copyNAR(source, sink);
-            sink << exportMagic << printStorePath(info.path);
-            WorkerProto::write(*this, *conn, info.references);
-            sink << (info.deriver ? printStorePath(*info.deriver) : "") << 0 // == no legacy signature
-                 << 0                                                        // == no path follows
-                ;
-        });
-        conn->importPaths(*this, &conn.daemonException, *source2);
-    }
-
-    else {
     conn->to << WorkerProto::Op::AddToStoreNar << printStorePath(info.path)
              << (info.deriver ? printStorePath(*info.deriver) : "")
              << info.narHash.to_string(HashFormat::Base16, false);
@@ -497,7 +442,6 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source, Repair
         conn.processStderr(0, nullptr);
     }
 }
-}
 
 void RemoteStore::addMultipleToStore(
     PathsSource && pathsToCopy, Activity & act, RepairFlag repair, CheckSigsFlag checkSigs)
@@ -618,15 +562,8 @@ void RemoteStore::buildPaths(
 
     auto conn(getConnection());
     conn->to << WorkerProto::Op::BuildPaths;
-    assert(GET_PROTOCOL_MINOR(conn->protoVersion) >= 13);
     WorkerProto::write(*this, *conn, drvPaths);
-    if (GET_PROTOCOL_MINOR(conn->protoVersion) >= 15)
     conn->to << buildMode;
-    else
-        /* Old daemons did not take a 'buildMode' parameter, so we
-           need to validate it here on the client side.  */
-        if (buildMode != bmNormal)
-            throw Error("repairing or checking is not supported when building through the Nix daemon");
     conn.processStderr();
     readInt(conn->from);
 }