Move Pair and Currency to coinnect::types

hugues31 · Jun 25, 2017 · 721359e · 721359e
1 parent e59117c
commit 721359e
Show file tree

Hide file tree

Showing 15 changed files with 259 additions and 271 deletions.
diff --git a/examples/generic_api.rs b/examples/generic_api.rs
@@ -9,7 +9,7 @@ extern crate coinnect;
 use coinnect::coinnect::Coinnect;
 use coinnect::kraken::KrakenCreds;
 use coinnect::exchange::Exchange::*;
-use coinnect::pair::Pair::*;
+use coinnect::types::Pair::*;
 
 fn main() {
     // We create a Coinnect Generic API

diff --git a/src/bitstamp/api.rs b/src/bitstamp/api.rs
@@ -18,7 +18,7 @@ use exchange::Exchange;
 
 use error::*;
 use helpers;
-use pair::Pair;
+use types::Pair;
 use bitstamp::utils;
 use types::*;
 

diff --git a/src/bitstamp/generic_api.rs b/src/bitstamp/generic_api.rs
@@ -7,7 +7,6 @@ use bitstamp::api::BitstampApi;
 use bitstamp::utils;
 
 use error::*;
-use pair::Pair;
 use types::*;
 use helpers;
 

diff --git a/src/bitstamp/utils.rs b/src/bitstamp/utils.rs
@@ -12,9 +12,9 @@ use std::time::Duration;
 
 use error::*;
 use helpers;
-use pair::Pair;
-use pair::Pair::*;
-use currency::Currency;
+use types::Currency;
+use types::Pair;
+use types::Pair::*;
 
 lazy_static! {
     static ref PAIRS_STRING: BidirMap<Pair, &'static str> = {
@@ -123,7 +123,7 @@ pub fn parse_result(response: &Map<String, Value>) -> Result<Map<String, Value>>
 ///
 /// ```
 /// use coinnect::bitstamp::utils::get_currency_enum;
-/// use coinnect::currency::Currency;
+/// use coinnect::types::Currency;
 ///
 /// let currency = get_currency_enum("usd_balance");
 /// assert_eq!(Some(Currency::USD), currency);
@@ -145,7 +145,7 @@ pub fn get_currency_enum(currency: &str) -> Option<Currency> {
 ///
 /// ```
 /// use coinnect::bitstamp::utils::get_currency_string;
-/// use coinnect::currency::Currency;
+/// use coinnect::types::Currency;
 ///
 /// let currency = get_currency_string(Currency::USD);
 /// assert_eq!(currency, Some("USD".to_string()));

diff --git a/src/currency.rs b/src/currency.rs
diff --git a/src/exchange.rs b/src/exchange.rs
@@ -5,7 +5,6 @@ use std::convert::Into;
 use std::str::FromStr;
 
 use error::*;
-use pair::Pair;
 use types::*;
 
 

diff --git a/src/kraken/generic_api.rs b/src/kraken/generic_api.rs
@@ -6,7 +6,6 @@ use exchange::ExchangeApi;
 use kraken::api::KrakenApi;
 
 use error::*;
-use pair::Pair;
 use types::*;
 use kraken::utils;
 use helpers;

diff --git a/src/kraken/utils.rs b/src/kraken/utils.rs
@@ -4,9 +4,9 @@ use serde_json::Value;
 use serde_json::value::Map;
 
 use error::*;
-use pair::Pair;
-use pair::Pair::*;
-use currency::Currency;
+use types::Currency;
+use types::Pair;
+use types::Pair::*;
 
 lazy_static! {
     static ref PAIRS_STRING: BidirMap<Pair, &'static str> = {
@@ -147,7 +147,7 @@ pub fn parse_result(response: &Map<String, Value>) -> Result<Map<String, Value>>
 ///
 /// ```
 /// use coinnect::kraken::utils::get_currency_enum;
-/// use coinnect::currency::Currency;
+/// use coinnect::types::Currency;
 ///
 /// let currency = get_currency_enum("ZUSD");
 /// assert_eq!(Some(Currency::USD), currency);
@@ -185,7 +185,7 @@ pub fn get_currency_enum(currency: &str) -> Option<Currency> {
 ///
 /// ```
 /// use coinnect::kraken::utils::get_currency_string;
-/// use coinnect::currency::Currency;
+/// use coinnect::types::Currency;
 ///
 /// let currency = get_currency_string(Currency::BTC);
 /// assert_eq!(currency, Some("XXBT".to_string()));

diff --git a/src/lib.rs b/src/lib.rs
@@ -44,8 +44,6 @@ extern crate error_chain;
 pub mod coinnect;
 pub mod exchange;
 pub mod error;
-pub mod currency;
-pub mod pair;
 pub mod types;
 mod helpers;
 

diff --git a/src/pair.rs b/src/pair.rs
diff --git a/src/poloniex/generic_api.rs b/src/poloniex/generic_api.rs
@@ -6,7 +6,6 @@ use exchange::ExchangeApi;
 use poloniex::api::PoloniexApi;
 
 use error::*;
-use pair::Pair;
 use types::*;
 use poloniex::utils;
 use helpers;

diff --git a/src/poloniex/utils.rs b/src/poloniex/utils.rs
@@ -3,10 +3,10 @@ use serde_json;
 use serde_json::Value;
 use serde_json::value::Map;
 
-use currency::Currency;
 use error::*;
-use pair::Pair;
-use pair::Pair::*;
+use types::Currency;
+use types::Pair;
+use types::Pair::*;
 
 lazy_static! {
     static ref PAIRS_STRING: BidirMap<Pair, &'static str> = {
@@ -157,7 +157,7 @@ pub fn parse_result(response: &Map<String, Value>) -> Result<Map<String, Value>>
 ///
 /// ```
 /// use coinnect::poloniex::utils::get_currency_enum;
-/// use coinnect::currency::Currency;
+/// use coinnect::types::Currency;
 ///
 /// let currency = get_currency_enum("BTC").unwrap();
 /// assert_eq!(currency, Currency::BTC);
@@ -186,7 +186,7 @@ pub fn get_currency_enum(currency: &str) -> Option<Currency> {
 ///
 /// ```
 /// use coinnect::poloniex::utils::get_currency_string;
-/// use coinnect::currency::Currency;
+/// use coinnect::types::Currency;
 ///
 /// let currency = get_currency_string(Currency::BTC);
 /// assert_eq!(currency, Some("BTC".to_string()));