From b0d31a88d54459fb363f5512f17be2ceceec66e1 Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Fri, 13 Dec 2019 12:44:46 +0000 Subject: [PATCH 1/2] cargo: set up as a lib --- Cargo.toml | 4 ++++ src/lib.rs | 1 + 2 files changed, 5 insertions(+) create mode 100644 src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index b745efc446..42a07e2328 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,10 @@ version = "0.1.0" authors = ["Dave Hrycyszyn "] edition = "2018" +[lib] +name = "nym_client" +path = "src/lib.rs" + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000000..705f46dba5 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1 @@ +pub mod clients; From f8c6f4633c18b792d5222bdb11d7e0de503c5558 Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Fri, 13 Dec 2019 12:47:19 +0000 Subject: [PATCH 2/2] Passing models by reference to keep borrow checker happy --- src/clients/directory/requests/metrics_mixes_post.rs | 8 ++++---- src/clients/directory/requests/presence_coconodes_post.rs | 8 ++++---- src/clients/directory/requests/presence_mixnodes_post.rs | 8 ++++---- src/clients/directory/requests/presence_providers_post.rs | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/clients/directory/requests/metrics_mixes_post.rs b/src/clients/directory/requests/metrics_mixes_post.rs index 4414e8e195..b7d412af81 100644 --- a/src/clients/directory/requests/metrics_mixes_post.rs +++ b/src/clients/directory/requests/metrics_mixes_post.rs @@ -8,7 +8,7 @@ pub struct Request { pub trait MetricsMixPoster { fn new(base_url: String) -> Self; - fn post(&self, metric: MixMetric) -> Result; + fn post(&self, metric: &MixMetric) -> Result; } impl MetricsMixPoster for Request { @@ -19,7 +19,7 @@ impl MetricsMixPoster for Request { } } - fn post(&self, metric: MixMetric) -> Result { + fn post(&self, metric: &MixMetric) -> Result { let url = format!("{}{}", self.base_url, self.path); let client = reqwest::Client::new(); let mix_metric_vec = client.post(&url).json(&metric).send()?; @@ -43,7 +43,7 @@ mod metrics_get_request { let _m = mock("POST", "/api/metrics/mixes").with_status(400).create(); let req = Request::new(mockito::server_url()); let metric = fixtures::new_metric(); - let result = req.post(metric); + let result = req.post(&metric); assert_eq!(400, result.unwrap().status()); _m.assert(); } @@ -61,7 +61,7 @@ mod metrics_get_request { .create(); let req = Request::new(mockito::server_url()); let metric = fixtures::new_metric(); - let result = req.post(metric); + let result = req.post(&metric); assert_eq!(true, result.is_ok()); _m.assert(); } diff --git a/src/clients/directory/requests/presence_coconodes_post.rs b/src/clients/directory/requests/presence_coconodes_post.rs index c1e30b145e..bc5f3aaf42 100644 --- a/src/clients/directory/requests/presence_coconodes_post.rs +++ b/src/clients/directory/requests/presence_coconodes_post.rs @@ -8,7 +8,7 @@ pub struct Request { pub trait PresenceCocoNodesPoster { fn new(base_url: String) -> Self; - fn post(&self, presence: CocoPresence) -> Result; + fn post(&self, presence: &CocoPresence) -> Result; } impl PresenceCocoNodesPoster for Request { @@ -19,7 +19,7 @@ impl PresenceCocoNodesPoster for Request { } } - fn post(&self, presence: CocoPresence) -> Result { + fn post(&self, presence: &CocoPresence) -> Result { let url = format!("{}{}", self.base_url, self.path); let client = reqwest::Client::new(); let p = client.post(&url).json(&presence).send()?; @@ -45,7 +45,7 @@ mod metrics_get_request { .create(); let req = Request::new(mockito::server_url()); let presence = fixtures::new_presence(); - let result = req.post(presence); + let result = req.post(&presence); assert_eq!(400, result.unwrap().status()); _m.assert(); } @@ -65,7 +65,7 @@ mod metrics_get_request { .create(); let req = Request::new(mockito::server_url()); let presence = fixtures::new_presence(); - let result = req.post(presence); + let result = req.post(&presence); assert_eq!(true, result.is_ok()); _m.assert(); } diff --git a/src/clients/directory/requests/presence_mixnodes_post.rs b/src/clients/directory/requests/presence_mixnodes_post.rs index 4bb0686ba3..8781b9a3dc 100644 --- a/src/clients/directory/requests/presence_mixnodes_post.rs +++ b/src/clients/directory/requests/presence_mixnodes_post.rs @@ -8,7 +8,7 @@ pub struct Request { pub trait PresenceMixNodesPoster { fn new(base_url: String) -> Self; - fn post(&self, presence: MixNodePresence) -> Result; + fn post(&self, presence: &MixNodePresence) -> Result; } impl PresenceMixNodesPoster for Request { @@ -19,7 +19,7 @@ impl PresenceMixNodesPoster for Request { } } - fn post(&self, presence: MixNodePresence) -> Result { + fn post(&self, presence: &MixNodePresence) -> Result { let url = format!("{}{}", self.base_url, self.path); let client = reqwest::Client::new(); let p = client.post(&url).json(&presence).send()?; @@ -45,7 +45,7 @@ mod metrics_get_request { .create(); let req = Request::new(mockito::server_url()); let presence = fixtures::new_presence(); - let result = req.post(presence); + let result = req.post(&presence); assert_eq!(400, result.unwrap().status()); _m.assert(); } @@ -65,7 +65,7 @@ mod metrics_get_request { .create(); let req = Request::new(mockito::server_url()); let presence = fixtures::new_presence(); - let result = req.post(presence); + let result = req.post(&presence); assert_eq!(true, result.is_ok()); _m.assert(); } diff --git a/src/clients/directory/requests/presence_providers_post.rs b/src/clients/directory/requests/presence_providers_post.rs index 8819926802..c79dbd3a68 100644 --- a/src/clients/directory/requests/presence_providers_post.rs +++ b/src/clients/directory/requests/presence_providers_post.rs @@ -8,7 +8,7 @@ pub struct Request { pub trait PresenceMixProviderPoster { fn new(base_url: String) -> Self; - fn post(&self, presence: MixProviderPresence) -> Result; + fn post(&self, presence: &MixProviderPresence) -> Result; } impl PresenceMixProviderPoster for Request { @@ -19,7 +19,7 @@ impl PresenceMixProviderPoster for Request { } } - fn post(&self, presence: MixProviderPresence) -> Result { + fn post(&self, presence: &MixProviderPresence) -> Result { let url = format!("{}{}", self.base_url, self.path); let client = reqwest::Client::new(); let p = client.post(&url).json(&presence).send()?; @@ -45,7 +45,7 @@ mod metrics_get_request { .create(); let req = Request::new(mockito::server_url()); let presence = fixtures::new_presence(); - let result = req.post(presence); + let result = req.post(&presence); assert_eq!(400, result.unwrap().status()); _m.assert(); } @@ -65,7 +65,7 @@ mod metrics_get_request { .create(); let req = Request::new(mockito::server_url()); let presence = fixtures::new_presence(); - let result = req.post(presence); + let result = req.post(&presence); assert_eq!(true, result.is_ok()); _m.assert(); }