Skip to content

Commit

Permalink
style: cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
pan93412 committed Jul 8, 2022
1 parent e7480ab commit 53a4f01
Show file tree
Hide file tree
Showing 47 changed files with 464 additions and 434 deletions.
5 changes: 2 additions & 3 deletions crypto-pair/tests/kraken.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ struct FuturesResponse<T: Sized> {
fn fetch_futures_markets_raw() -> Vec<FuturesMarket> {
let txt = http_get("https://futures.kraken.com/derivatives/api/v3/instruments").unwrap();
let obj = serde_json::from_str::<FuturesResponse<FuturesMarket>>(&txt).unwrap();

obj
.instruments

obj.instruments
.into_iter()
.filter(|x| x.tradeable)
.filter(|m| m.symbol.starts_with("pi_") || m.symbol.starts_with("fi_"))
Expand Down
6 changes: 4 additions & 2 deletions crypto-ws-client/src/clients/binance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,10 @@ mod tests {
let translator = super::BinanceCommandTranslator { market_type: 'S' };
let commands = translator.translate_to_commands(
true,
&[("aggTrade".to_string(), "BTCUSDT".to_string()),
("ticker".to_string(), "BTCUSDT".to_string())],
&[
("aggTrade".to_string(), "BTCUSDT".to_string()),
("ticker".to_string(), "BTCUSDT".to_string()),
],
);

assert_eq!(1, commands.len());
Expand Down
6 changes: 4 additions & 2 deletions crypto-ws-client/src/clients/binance_option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@ mod tests {
let translator = super::BinanceOptionCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trade".to_string(), "BTC-220429-50000-C".to_string()),
("ticker".to_string(), "BTC-220429-50000-C".to_string())],
&[
("trade".to_string(), "BTC-220429-50000-C".to_string()),
("ticker".to_string(), "BTC-220429-50000-C".to_string()),
],
);

assert_eq!(1, commands.len());
Expand Down
6 changes: 2 additions & 4 deletions crypto-ws-client/src/clients/bitfinex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,8 @@ mod tests {
#[test]
fn test_swap_command() {
let translator = super::BitfinexCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trades".to_string(), "tBTCF0:USTF0".to_string())],
);
let commands = translator
.translate_to_commands(true, &[("trades".to_string(), "tBTCF0:USTF0".to_string())]);

assert_eq!(1, commands.len());
assert_eq!(
Expand Down
10 changes: 6 additions & 4 deletions crypto-ws-client/src/clients/bitget/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ mod tests {
#[test]
fn test_one_topic() {
let translator = super::BitgetCommandTranslator::<'S'> {};
let commands = translator
.translate_to_commands(true, &[("trade".to_string(), "BTCUSDT".to_string())]);
let commands =
translator.translate_to_commands(true, &[("trade".to_string(), "BTCUSDT".to_string())]);

assert_eq!(1, commands.len());
assert_eq!(
Expand All @@ -172,8 +172,10 @@ mod tests {
let translator = super::BitgetCommandTranslator::<'S'> {};
let commands = translator.translate_to_commands(
true,
&[("trade".to_string(), "BTCUSDT".to_string()),
("books".to_string(), "ETHUSDT".to_string())],
&[
("trade".to_string(), "BTCUSDT".to_string()),
("books".to_string(), "ETHUSDT".to_string()),
],
);

assert_eq!(1, commands.len());
Expand Down
12 changes: 8 additions & 4 deletions crypto-ws-client/src/clients/bithumb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,10 @@ mod tests {
let translator = super::BithumbCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("TRADE".to_string(), "BTC-USDT".to_string()),
("TRADE".to_string(), "ETH-USDT".to_string())],
&[
("TRADE".to_string(), "BTC-USDT".to_string()),
("TRADE".to_string(), "ETH-USDT".to_string()),
],
);

assert_eq!(1, commands.len());
Expand All @@ -147,8 +149,10 @@ mod tests {
let translator = super::BithumbCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("TRADE".to_string(), "BTC-USDT".to_string()),
("ORDERBOOK".to_string(), "BTC-USDT".to_string())],
&[
("TRADE".to_string(), "BTC-USDT".to_string()),
("ORDERBOOK".to_string(), "BTC-USDT".to_string()),
],
);

assert_eq!(1, commands.len());
Expand Down
10 changes: 6 additions & 4 deletions crypto-ws-client/src/clients/bitmex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ mod tests {
#[test]
fn test_one_topic() {
let translator = super::BitmexCommandTranslator {};
let commands = translator
.translate_to_commands(true, &[("trade".to_string(), "XBTUSD".to_string())]);
let commands =
translator.translate_to_commands(true, &[("trade".to_string(), "XBTUSD".to_string())]);

assert_eq!(1, commands.len());
assert_eq!(r#"{"op":"subscribe","args":["trade:XBTUSD"]}"#, commands[0]);
Expand All @@ -189,10 +189,12 @@ mod tests {
let translator = super::BitmexCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trade".to_string(), "XBTUSD".to_string()),
&[
("trade".to_string(), "XBTUSD".to_string()),
("quote".to_string(), "XBTUSD".to_string()),
("orderBookL2_25".to_string(), "XBTUSD".to_string()),
("tradeBin1m".to_string(), "XBTUSD".to_string())],
("tradeBin1m".to_string(), "XBTUSD".to_string()),
],
);

assert_eq!(1, commands.len());
Expand Down
12 changes: 6 additions & 6 deletions crypto-ws-client/src/clients/bitstamp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,8 @@ mod tests {
#[test]
fn test_one_topic() {
let translator = super::BitstampCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("live_trades".to_string(), "btcusd".to_string())],
);
let commands = translator
.translate_to_commands(true, &[("live_trades".to_string(), "btcusd".to_string())]);

assert_eq!(1, commands.len());
assert_eq!(
Expand All @@ -148,8 +146,10 @@ mod tests {
let translator = super::BitstampCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("live_trades".to_string(), "btcusd".to_string()),
("diff_order_book".to_string(), "btcusd".to_string())],
&[
("live_trades".to_string(), "btcusd".to_string()),
("diff_order_book".to_string(), "btcusd".to_string()),
],
);

assert_eq!(2, commands.len());
Expand Down
6 changes: 4 additions & 2 deletions crypto-ws-client/src/clients/bybit/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@ mod tests {
#[test]
fn test_multiple_channels() {
let command = super::topics_to_command(
&[("trade".to_string(), "BTCUSD".to_string()),
&[
("trade".to_string(), "BTCUSD".to_string()),
("orderBookL2_25".to_string(), "BTCUSD".to_string()),
("instrument_info.100ms".to_string(), "BTCUSD".to_string())],
("instrument_info.100ms".to_string(), "BTCUSD".to_string()),
],
true,
);

Expand Down
12 changes: 8 additions & 4 deletions crypto-ws-client/src/clients/coinbase_pro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,10 @@ mod tests {
let translator = super::CoinbaseProCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("matches".to_string(), "BTC-USD".to_string()),
("matches".to_string(), "ETH-USD".to_string())],
&[
("matches".to_string(), "BTC-USD".to_string()),
("matches".to_string(), "ETH-USD".to_string()),
],
);

assert_eq!(1, commands.len());
Expand All @@ -178,8 +180,10 @@ mod tests {
let translator = super::CoinbaseProCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("matches".to_string(), "BTC-USD".to_string()),
("level2".to_string(), "BTC-USD".to_string())],
&[
("matches".to_string(), "BTC-USD".to_string()),
("level2".to_string(), "BTC-USD".to_string()),
],
);

assert_eq!(1, commands.len());
Expand Down
6 changes: 4 additions & 2 deletions crypto-ws-client/src/clients/deribit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,10 @@ mod tests {
let translator = super::DeribitCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trades.SYMBOL.100ms".to_string(), "BTC-26MAR21".to_string()),
("ticker.SYMBOL.100ms".to_string(), "BTC-26MAR21".to_string())],
&[
("trades.SYMBOL.100ms".to_string(), "BTC-26MAR21".to_string()),
("ticker.SYMBOL.100ms".to_string(), "BTC-26MAR21".to_string()),
],
);

assert_eq!(2, commands.len());
Expand Down
12 changes: 6 additions & 6 deletions crypto-ws-client/src/clients/dydx/dydx_swap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,8 @@ mod tests {
#[test]
fn test_one_topic() {
let translator = super::DydxCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("v3_trades".to_string(), "BTC-USD".to_string())],
);
let commands = translator
.translate_to_commands(true, &[("v3_trades".to_string(), "BTC-USD".to_string())]);

assert_eq!(1, commands.len());
assert_eq!(
Expand All @@ -148,8 +146,10 @@ mod tests {
let translator = super::DydxCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("v3_trades".to_string(), "BTC-USD".to_string()),
("v3_orderbook".to_string(), "BTC-USD".to_string())],
&[
("v3_trades".to_string(), "BTC-USD".to_string()),
("v3_orderbook".to_string(), "BTC-USD".to_string()),
],
);

assert_eq!(2, commands.len());
Expand Down
6 changes: 4 additions & 2 deletions crypto-ws-client/src/clients/ftx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ mod tests {
let translator = super::FtxCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trades".to_string(), "BTC/USD".to_string()),
("orderbook".to_string(), "BTC/USD".to_string())],
&[
("trades".to_string(), "BTC/USD".to_string()),
("orderbook".to_string(), "BTC/USD".to_string()),
],
);

assert_eq!(2, commands.len());
Expand Down
36 changes: 24 additions & 12 deletions crypto-ws-client/src/clients/gate/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,19 @@ mod tests {
r#"{"channel":"spot.trades", "event":"subscribe", "payload":["BTC_USDT","ETH_USDT"]}"#,
translator.translate_to_commands(
true,
&[("trades".to_string(), "BTC_USDT".to_string()),
("trades".to_string(), "ETH_USDT".to_string())]
&[
("trades".to_string(), "BTC_USDT".to_string()),
("trades".to_string(), "ETH_USDT".to_string())
]
)[0]
);

let commands = translator.translate_to_commands(
true,
&[("order_book".to_string(), "BTC_USDT".to_string()),
("order_book".to_string(), "ETH_USDT".to_string())],
&[
("order_book".to_string(), "BTC_USDT".to_string()),
("order_book".to_string(), "ETH_USDT".to_string()),
],
);
assert_eq!(2, commands.len());
assert_eq!(
Expand All @@ -236,8 +240,10 @@ mod tests {

let commands = translator.translate_to_commands(
true,
&[("order_book_update".to_string(), "BTC_USDT".to_string()),
("order_book_update".to_string(), "ETH_USDT".to_string())],
&[
("order_book_update".to_string(), "BTC_USDT".to_string()),
("order_book_update".to_string(), "ETH_USDT".to_string()),
],
);
assert_eq!(2, commands.len());
assert_eq!(
Expand All @@ -258,15 +264,19 @@ mod tests {
r#"{"channel":"futures.trades", "event":"subscribe", "payload":["BTC_USD","ETH_USD"]}"#,
translator.translate_to_commands(
true,
&[("trades".to_string(), "BTC_USD".to_string()),
("trades".to_string(), "ETH_USD".to_string())]
&[
("trades".to_string(), "BTC_USD".to_string()),
("trades".to_string(), "ETH_USD".to_string())
]
)[0]
);

let commands = translator.translate_to_commands(
true,
&[("order_book".to_string(), "BTC_USD".to_string()),
("order_book".to_string(), "ETH_USD".to_string())],
&[
("order_book".to_string(), "BTC_USD".to_string()),
("order_book".to_string(), "ETH_USD".to_string()),
],
);
assert_eq!(2, commands.len());
assert_eq!(
Expand All @@ -280,8 +290,10 @@ mod tests {

let commands = translator.translate_to_commands(
true,
&[("order_book_update".to_string(), "BTC_USD".to_string()),
("order_book_update".to_string(), "ETH_USD".to_string())],
&[
("order_book_update".to_string(), "BTC_USD".to_string()),
("order_book_update".to_string(), "ETH_USD".to_string()),
],
);
assert_eq!(2, commands.len());
assert_eq!(
Expand Down
12 changes: 6 additions & 6 deletions crypto-ws-client/src/clients/huobi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,8 @@ mod tests {
#[test]
fn test_one_topic() {
let translator = super::HuobiCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trade.detail".to_string(), "btcusdt".to_string())],
);
let commands = translator
.translate_to_commands(true, &[("trade.detail".to_string(), "btcusdt".to_string())]);

assert_eq!(1, commands.len());
assert_eq!(
Expand All @@ -350,8 +348,10 @@ mod tests {
let translator = super::HuobiCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trade.detail".to_string(), "btcusdt".to_string()),
("bbo".to_string(), "btcusdt".to_string())],
&[
("trade.detail".to_string(), "btcusdt".to_string()),
("bbo".to_string(), "btcusdt".to_string()),
],
);

assert_eq!(2, commands.len());
Expand Down
6 changes: 4 additions & 2 deletions crypto-ws-client/src/clients/kraken/kraken_futures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,10 @@ mod tests {
let translator = super::KrakenCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trade".to_string(), "PI_XBTUSD".to_string()),
("trade".to_string(), "PI_ETHUSD".to_string())],
&[
("trade".to_string(), "PI_XBTUSD".to_string()),
("trade".to_string(), "PI_ETHUSD".to_string()),
],
);

assert_eq!(2, commands.len());
Expand Down
10 changes: 6 additions & 4 deletions crypto-ws-client/src/clients/kraken/kraken_spot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ mod tests {
#[test]
fn test_one_symbol() {
let translator = super::KrakenCommandTranslator {};
let commands = translator
.translate_to_commands(true, &[("trade".to_string(), "XBT/USD".to_string())]);
let commands =
translator.translate_to_commands(true, &[("trade".to_string(), "XBT/USD".to_string())]);

assert_eq!(1, commands.len());
assert_eq!(
Expand All @@ -265,8 +265,10 @@ mod tests {
let translator = super::KrakenCommandTranslator {};
let commands = translator.translate_to_commands(
true,
&[("trade".to_string(), "XBT/USD".to_string()),
("trade".to_string(), "ETH/USD".to_string())],
&[
("trade".to_string(), "XBT/USD".to_string()),
("trade".to_string(), "ETH/USD".to_string()),
],
);

assert_eq!(1, commands.len());
Expand Down
Loading

0 comments on commit 53a4f01

Please sign in to comment.