From 78d3cbbe2c613b91bb414c47b0a18c1e85267c5c Mon Sep 17 00:00:00 2001
From: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
Date: Tue, 10 Dec 2019 17:31:23 +0000
Subject: [PATCH] directory: shortening healthcheck request names

---
 src/clients/directory/healthcheck/requests.rs | 18 +++++++++---------
 src/clients/directory/mod.rs                  |  6 +++---
 src/main.rs                                   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/clients/directory/healthcheck/requests.rs b/src/clients/directory/healthcheck/requests.rs
index 652599b0b4..bf9d8c4488 100644
--- a/src/clients/directory/healthcheck/requests.rs
+++ b/src/clients/directory/healthcheck/requests.rs
@@ -1,20 +1,20 @@
 use reqwest::Response;
 
-pub struct Requester {
+pub struct Request {
     base_url: String,
 }
 
 pub trait HealthCheckRequester {
     fn new(base_url: String) -> Self;
-    fn make_request(&self) -> Result<Response, reqwest::Error>;
+    fn get(&self) -> Result<Response, reqwest::Error>;
 }
 
-impl HealthCheckRequester for Requester {
+impl HealthCheckRequester for Request {
     fn new(base_url: String) -> Self {
-        Requester { base_url }
+        Request { base_url }
     }
 
-    fn make_request(&self) -> Result<Response, reqwest::Error> {
+    fn get(&self) -> Result<Response, reqwest::Error> {
         let url = format!("{}/healthcheck", self.base_url);
         reqwest::get(&url)
     }
@@ -34,8 +34,8 @@ mod healthcheck_requests {
         #[should_panic]
         fn it_returns_an_error() {
             let _m = mock("GET", "/healthcheck").with_status(400).create();
-            let req = Requester::new(mockito::server_url());
-            assert_eq!(true, req.make_request().is_err());
+            let req = Request::new(mockito::server_url());
+            assert_eq!(true, req.get().is_err());
         }
     }
 
@@ -46,9 +46,9 @@ mod healthcheck_requests {
         #[test]
         fn it_returns_a_response_with_200_status() {
             let _m = mock("GET", "/healthcheck").with_status(200).create();
-            let req = Requester::new(mockito::server_url());
+            let req = Request::new(mockito::server_url());
 
-            assert_eq!(true, req.make_request().is_ok());
+            assert_eq!(true, req.get().is_ok());
         }
     }
 }
diff --git a/src/clients/directory/mod.rs b/src/clients/directory/mod.rs
index a9ae39b49e..440e893eb1 100644
--- a/src/clients/directory/mod.rs
+++ b/src/clients/directory/mod.rs
@@ -1,7 +1,7 @@
 use sphinx::route::{Node as SphinxNode, Destination};
 use crate::clients::directory::presence::models::Topology;
 use reqwest::{Error};
-use crate::clients::directory::healthcheck::requests::{Requester, HealthCheckRequester};
+use crate::clients::directory::healthcheck::requests::{Request, HealthCheckRequester};
 
 //use serde::Deserialize;
 
@@ -20,13 +20,13 @@ pub trait DirectoryClient {
 }
 
 pub struct Client {
-    pub health_check: Requester,
+    pub health_check: Request,
 }
 
 impl DirectoryClient for Client {
     fn new(config: Config) -> Client {
         let topology = retrieve_topology().unwrap();
-        let hcr: Requester = Requester::new(config.base_url);
+        let hcr: Request = Request::new(config.base_url);
         Client {
             health_check: hcr,
         }
diff --git a/src/main.rs b/src/main.rs
index c2ee3ae463..5d7fbcfe72 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ use tokio::runtime::Runtime;
 use tokio::time::{interval_at, Instant};
 
 use crate::clients::directory;
-use crate::clients::directory::healthcheck::requests::{Requester, HealthCheckRequester};
+use crate::clients::directory::healthcheck::requests::{Request, HealthCheckRequester};
 use crate::clients::directory::DirectoryClient;
 
 mod clients;
@@ -65,7 +65,7 @@ fn run(matches: &ArgMatches) {
             // make sure the Directory server is in fact running, panic if not
             directory
                 .health_check
-                .make_request()
+                .get()
                 .expect("Directory health check failed, is the Directory server running?");
 
             //            let route = directory.get_mixes();