From af47a89d6f40f3a90d57d4c6e7b4a88258ba6f0b Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Thu, 16 Jul 2020 21:03:59 -0700
Subject: chore(3p/nix/proto): Fix style violations in new proto defs

This is a blocker to enabling the linter.

Change-Id: I9f8d3cc19c7539086f53474a505362230fc56c04
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1245
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
---
 third_party/nix/src/nix-daemon/nix-daemon-proto.cc |  4 ++--
 third_party/nix/src/proto/worker.proto             | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'third_party/nix')

diff --git a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc
index 33bff437600d..85c9a7bc1467 100644
--- a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc
+++ b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc
@@ -7,9 +7,9 @@ namespace nix::daemon {
 using ::grpc::Status;
 using ::nix::proto::StorePath;
 using ::nix::proto::StorePaths;
-using ::nix::proto::Worker;
+using ::nix::proto::WorkerService;
 
-class WorkerServiceImpl final : public Worker::Service {
+class WorkerServiceImpl final : public WorkerService::Service {
  public:
   WorkerServiceImpl(nix::Store* store) : store_(store) {}
 
diff --git a/third_party/nix/src/proto/worker.proto b/third_party/nix/src/proto/worker.proto
index 32df488a5d8a..6d4b2a9547f1 100644
--- a/third_party/nix/src/proto/worker.proto
+++ b/third_party/nix/src/proto/worker.proto
@@ -7,7 +7,7 @@ package nix.proto;
 
 // Service representing a worker used for building and interfacing
 // with the Nix store.
-service Worker {
+service WorkerService {
   // Validates whether the supplied path is a valid store path.
   rpc IsValidPath(StorePath) returns (IsValidPathResponse);
 
@@ -279,7 +279,7 @@ message HashPart {
 message VerifyStoreRequest {
   bool repair = 1;
   // TODO(grfn): Remove double-negative
-  bool dontCheckSigs = 2;
+  bool dont_check_sigs = 2;
 }
 
 message VerifyStoreResponse {
@@ -289,13 +289,13 @@ message VerifyStoreResponse {
 
 message BuildDerivationRequest {
   // Only used for informational purposes.
-  StorePath drvPath = 1;
-  BuildMode buildMode = 2;
+  StorePath drv_path = 1;
+  BuildMode build_mode = 2;
 }
 
 message BuildDerivationResponse {
   BuildStatus status = 1;
-  string errorMessage = 2;
+  string error_message = 2;
 }
 
 message AddToStoreNarRequest {
-- 
cgit 1.4.1