From 8c0e14e039a9a3f14441aa25c6c66656e74d912e Mon Sep 17 00:00:00 2001
From: Andrew Lamb <alamb@influxdata.com>
Date: Thu, 3 Dec 2020 09:59:00 -0500
Subject: [PATCH] refactor: rename src/server/rpc/storage.rs to
 src/server/rpc/service.rs (#513)

* refactor: rename src/server/rpc/storage.rs src/server/rpc/service.rs

* refactor: update references
---
 src/commands/server.rs                    | 6 +++---
 src/server/rpc.rs                         | 2 +-
 src/server/rpc/{storage.rs => service.rs} | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/server/rpc/{storage.rs => service.rs} (99%)

diff --git a/src/commands/server.rs b/src/commands/server.rs
index 99b0e13f30..76b08864b5 100644
--- a/src/commands/server.rs
+++ b/src/commands/server.rs
@@ -6,7 +6,7 @@ use std::sync::Arc;
 use std::{env::VarError, path::PathBuf};
 
 use crate::server::http_routes;
-use crate::server::rpc::storage;
+use crate::server::rpc::service;
 
 use hyper::service::{make_service_fn, service_fn};
 use hyper::Server;
@@ -50,7 +50,7 @@ pub enum Error {
 
     #[snafu(display("Error serving RPC: {}", source))]
     ServingRPC {
-        source: crate::server::rpc::storage::Error,
+        source: crate::server::rpc::service::Error,
     },
 }
 
@@ -107,7 +107,7 @@ pub async fn main() -> Result<()> {
         .await
         .expect("failed to bind server");
 
-    let grpc_server = storage::make_server(socket, storage.clone(), executor);
+    let grpc_server = service::make_server(socket, storage.clone(), executor);
 
     info!("gRPC server listening on http://{}", grpc_bind_addr);
 
diff --git a/src/server/rpc.rs b/src/server/rpc.rs
index 9e0d94d9ad..05489e30cc 100644
--- a/src/server/rpc.rs
+++ b/src/server/rpc.rs
@@ -11,4 +11,4 @@ pub(crate) const TAG_KEY_FIELD: &[u8] = &[255];
 pub mod data;
 pub mod expr;
 pub mod input;
-pub mod storage;
+pub mod service;
diff --git a/src/server/rpc/storage.rs b/src/server/rpc/service.rs
similarity index 99%
rename from src/server/rpc/storage.rs
rename to src/server/rpc/service.rs
index 77e45001a6..7dc33a3c46 100644
--- a/src/server/rpc/storage.rs
+++ b/src/server/rpc/service.rs
@@ -1736,7 +1736,7 @@ mod tests {
         // Note we don't include the actual line / column in the
         // expected panic message to avoid needing to update the test
         // whenever the source code file changed.
-        let expected_error = "panicked at 'This is a test panic', src/server/rpc/storage.rs";
+        let expected_error = "panicked at 'This is a test panic', src/server/rpc/service.rs";
         assert!(
             captured_logs.contains(expected_error),
             "Logs did not contain expected panic message '{}'. They were\n{}",