Merge pull request #21 from nymtech/feature/libify

Feature/libify
This commit is contained in:
Jędrzej Stuczyński
2019-12-13 12:50:15 +00:00
committed by GitHub
6 changed files with 21 additions and 16 deletions
+4
View File
@@ -4,6 +4,10 @@ version = "0.1.0"
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
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]
@@ -8,7 +8,7 @@ pub struct Request {
pub trait MetricsMixPoster {
fn new(base_url: String) -> Self;
fn post(&self, metric: MixMetric) -> Result<Response, reqwest::Error>;
fn post(&self, metric: &MixMetric) -> Result<Response, reqwest::Error>;
}
impl MetricsMixPoster for Request {
@@ -19,7 +19,7 @@ impl MetricsMixPoster for Request {
}
}
fn post(&self, metric: MixMetric) -> Result<Response, reqwest::Error> {
fn post(&self, metric: &MixMetric) -> Result<Response, reqwest::Error> {
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();
}
@@ -8,7 +8,7 @@ pub struct Request {
pub trait PresenceCocoNodesPoster {
fn new(base_url: String) -> Self;
fn post(&self, presence: CocoPresence) -> Result<Response, reqwest::Error>;
fn post(&self, presence: &CocoPresence) -> Result<Response, reqwest::Error>;
}
impl PresenceCocoNodesPoster for Request {
@@ -19,7 +19,7 @@ impl PresenceCocoNodesPoster for Request {
}
}
fn post(&self, presence: CocoPresence) -> Result<Response, reqwest::Error> {
fn post(&self, presence: &CocoPresence) -> Result<Response, reqwest::Error> {
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();
}
@@ -8,7 +8,7 @@ pub struct Request {
pub trait PresenceMixNodesPoster {
fn new(base_url: String) -> Self;
fn post(&self, presence: MixNodePresence) -> Result<Response, reqwest::Error>;
fn post(&self, presence: &MixNodePresence) -> Result<Response, reqwest::Error>;
}
impl PresenceMixNodesPoster for Request {
@@ -19,7 +19,7 @@ impl PresenceMixNodesPoster for Request {
}
}
fn post(&self, presence: MixNodePresence) -> Result<Response, reqwest::Error> {
fn post(&self, presence: &MixNodePresence) -> Result<Response, reqwest::Error> {
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();
}
@@ -8,7 +8,7 @@ pub struct Request {
pub trait PresenceMixProviderPoster {
fn new(base_url: String) -> Self;
fn post(&self, presence: MixProviderPresence) -> Result<Response, reqwest::Error>;
fn post(&self, presence: &MixProviderPresence) -> Result<Response, reqwest::Error>;
}
impl PresenceMixProviderPoster for Request {
@@ -19,7 +19,7 @@ impl PresenceMixProviderPoster for Request {
}
}
fn post(&self, presence: MixProviderPresence) -> Result<Response, reqwest::Error> {
fn post(&self, presence: &MixProviderPresence) -> Result<Response, reqwest::Error> {
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();
}
+1
View File
@@ -0,0 +1 @@
pub mod clients;