From f4fde15810231e49ac5224a02f09d4d4ade94d10 Mon Sep 17 00:00:00 2001 From: Marco Neumann Date: Thu, 16 Dec 2021 08:19:33 +0000 Subject: [PATCH] refactor: nicer code Co-authored-by: Carol (Nichols || Goulding) <193874+carols10cents@users.noreply.github.com> --- .../src/influxdb_ioxd/server_type/test.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/influxdb_iox/src/influxdb_ioxd/server_type/test.rs b/influxdb_iox/src/influxdb_ioxd/server_type/test.rs index 5129f64e79..4daeb1b187 100644 --- a/influxdb_iox/src/influxdb_ioxd/server_type/test.rs +++ b/influxdb_iox/src/influxdb_ioxd/server_type/test.rs @@ -97,17 +97,16 @@ impl ServerType for TestServerType { } async fn server_grpc(self: Arc, builder_input: RpcBuilderInput) -> Result<(), RpcError> { - if self.test_action == TestAction::PanicInGrpcWorker { - panic!("Test panic in gRPC worker"); - } - if self.test_action == TestAction::EarlyReturnFromGrpcWorker { - return Ok(()); - } + match self.test_action { + TestAction::PanicInGrpcWorker => panic!("Test panic in gRPC worker"), + TestAction::EarlyReturnFromGrpcWorker => Ok(()), + _ => { + let builder = setup_builder!(builder_input, self); + serve_builder!(builder); - let builder = setup_builder!(builder_input, self); - serve_builder!(builder); - - Ok(()) + Ok(()) + } + } } async fn join(self: Arc) {