about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKane York <kanepyork@gmail.com>2020-07-17T04·03-0700
committerKane York <rikingcoding@gmail.com>2020-07-17T20·01+0000
commitaf47a89d6f40f3a90d57d4c6e7b4a88258ba6f0b (patch)
tree10e83942c8930b6b3be2802492516cdfab401802
parent39ab9d8fc69bb0fb0daec27d0f2e00959d9dbfdd (diff)
chore(3p/nix/proto): Fix style violations in new proto defs r/1350
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>
-rw-r--r--third_party/nix/src/nix-daemon/nix-daemon-proto.cc4
-rw-r--r--third_party/nix/src/proto/worker.proto10
2 files changed, 7 insertions, 7 deletions
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 {