Factor out ServeProto::BasicClientConnection::buildDerivation

For Hydra.

Author: Ericson2314

src/libstore/legacy-ssh-store.cc

@@ -250,16 +250,16 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
 
 private:
 
-    void putBuildSettings(Connection & conn)
+    ServeProto::BasicClientConnection::BuildOptions buildSettings()
     {
-        conn.putBuildSettings({
+        return {
             .maxSilentTime = settings.maxSilentTime,
             .buildTimeout = settings.buildTimeout,
             .repeats = 0, // buildRepeat hasn't worked for ages anyway
             .maxLogSize = settings.maxLogSize,
             .enforceDeterminism = 0,
             .keepFailed = settings.keepFailed,
-        });
+        };
     }
 
 public:
@@ -269,16 +269,7 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
     {
         auto conn(connections->get());
 
-        conn->to
-            << ServeProto::Command::BuildDerivation
-            << printStorePath(drvPath);
-        writeDerivation(conn->to, *this, drv);
-
-        putBuildSettings(*conn);
-
-        conn->to.flush();
-
-        return ServeProto::Serialise<BuildResult>::read(*this, *conn);
+        return conn->buildDerivation(*this, drvPath, drv, buildSettings());
     }
 
     void buildPaths(const std::vector<DerivedPath> & drvPaths, BuildMode buildMode, std::shared_ptr<Store> evalStore) override
@@ -306,7 +297,7 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
         }
         conn->to << ss;
 
-        putBuildSettings(*conn);
+        conn->putBuildSettings(buildSettings());
 
         conn->to.flush();
 

src/libstore/serve-protocol-impl.cc

@@ -1,4 +1,6 @@
 #include "serve-protocol-impl.hh"
+#include "build-result.hh"
+#include "derivations.hh"
 
 namespace nix {
 
@@ -36,4 +38,22 @@ void ServeProto::BasicClientConnection::putBuildSettings(
     }
 }
 
+
+BuildResult ServeProto::BasicClientConnection::buildDerivation(
+    const Store & store,
+    const StorePath & drvPath, const BasicDerivation & drv,
+    const ServeProto::BasicClientConnection::BuildOptions & options)
+{
+    to
+        << ServeProto::Command::BuildDerivation
+        << store.printStorePath(drvPath);
+    writeDerivation(to, store, drv);
+
+    putBuildSettings(options);
+
+    to.flush();
+
+    return ServeProto::Serialise<BuildResult>::read(store, *this);
+}
+
 }

src/libstore/serve-protocol-impl.hh

@@ -108,6 +108,11 @@ struct ServeProto::BasicClientConnection
     };
 
     void putBuildSettings(const BuildOptions & options);
+
+    BuildResult buildDerivation(
+        const Store & store,
+        const StorePath & drvPath, const BasicDerivation & drv,
+        const ServeProto::BasicClientConnection::BuildOptions & options);
 };
 
 }