Skip to content

prefer 'HashMap' to 'BTreeMap' when ordering isn't important #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
danieleades wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

prefer 'HashMap' to 'BTreeMap' when ordering isn't important #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
69af5f2
prefer 'HashMap' to 'BTreeMap' when ordering isn't important
danieleades Oct 26, 2022
b298cb8
fix some tests
danieleades Oct 26, 2022
dfc31d6
fix some tests
danieleades Oct 27, 2022
b32c143
fix some tests
danieleades Oct 27, 2022
6843bd9
fix some tests
danieleades Oct 27, 2022
97bdd1b
fix some tests
danieleades Oct 27, 2022
8fb136c
fix some tests
danieleades Oct 27, 2022
70a96b9
fix some tests
danieleades Oct 27, 2022
e81b030
fix some tests
danieleades Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 33 additions & 48 deletions src/account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::model::{
};
use crate::client::Client;
use crate::errors::Result;
use std::collections::BTreeMap;
use std::collections::HashMap;
use std::fmt::Display;
use crate::api::API;
use crate::api::Spot;
Expand Down Expand Up @@ -88,7 +88,7 @@ impl Display for TimeInForce {
impl Account {
// Account Information
pub fn get_account(&self) -> Result<AccountInformation> {
let request = build_signed_request(BTreeMap::new(), self.recv_window)?;
let request = build_signed_request(HashMap::new(), self.recv_window)?;
self.client
.get_signed(API::Spot(Spot::Account), Some(request))
}
Expand Down Expand Up @@ -117,19 +117,14 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());

let request = build_signed_request(parameters, self.recv_window)?;
let request = build_signed_request([("symbol", symbol.into())].into(), self.recv_window)?;
self.client
.get_signed(API::Spot(Spot::OpenOrders), Some(request))
}

// All current open orders
pub fn get_all_open_orders(&self) -> Result<Vec<Order>> {
let parameters: BTreeMap<String, String> = BTreeMap::new();

let request = build_signed_request(parameters, self.recv_window)?;
let request = build_signed_request(HashMap::new(), self.recv_window)?;
self.client
.get_signed(API::Spot(Spot::OpenOrders), Some(request))
}
Expand All @@ -139,9 +134,7 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
let request = build_signed_request(parameters, self.recv_window)?;
let request = build_signed_request([("symbol", symbol.into())].into(), self.recv_window)?;
self.client
.delete_signed(API::Spot(Spot::OpenOrders), Some(request))
}
Expand All @@ -151,9 +144,7 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("orderId".into(), order_id.to_string());
let parameters = [("symbol", symbol.into()), ("orderId", order_id.to_string())].into();

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand All @@ -167,9 +158,7 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("orderId".into(), order_id.to_string());
let parameters = [("symbol", symbol.into()), ("orderId", order_id.to_string())].into();

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand Down Expand Up @@ -668,9 +657,7 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("orderId".into(), order_id.to_string());
let parameters = [("symbol", symbol.into()), ("orderId", order_id.to_string())].into();

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand All @@ -683,9 +670,9 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("origClientOrderId".into(), orig_client_order_id);
let mut parameters: HashMap<&'static str, String> = HashMap::new();
parameters.insert("symbol", symbol.into());
parameters.insert("origClientOrderId", orig_client_order_id);

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand All @@ -698,9 +685,7 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("orderId".into(), order_id.to_string());
let parameters = [("symbol", symbol.into()), ("orderId", order_id.to_string())].into();
let request = build_signed_request(parameters, self.recv_window)?;
self.client
.delete_signed::<Empty>(API::Spot(Spot::OrderTest), Some(request))
Expand All @@ -712,55 +697,55 @@ impl Account {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
let mut parameters: HashMap<&'static str, String> = HashMap::new();
parameters.insert("symbol", symbol.into());

let request = build_signed_request(parameters, self.recv_window)?;
self.client
.get_signed(API::Spot(Spot::MyTrades), Some(request))
}

fn build_order(&self, order: OrderRequest) -> BTreeMap<String, String> {
let mut order_parameters: BTreeMap<String, String> = BTreeMap::new();
fn build_order(&self, order: OrderRequest) -> HashMap<&'static str, String> {
let mut order_parameters = HashMap::new();

order_parameters.insert("symbol".into(), order.symbol);
order_parameters.insert("side".into(), order.order_side.to_string());
order_parameters.insert("type".into(), order.order_type.to_string());
order_parameters.insert("quantity".into(), order.qty.to_string());
order_parameters.insert("symbol", order.symbol);
order_parameters.insert("side", order.order_side.to_string());
order_parameters.insert("type", order.order_type.to_string());
order_parameters.insert("quantity", order.qty.to_string());

if let Some(stop_price) = order.stop_price {
order_parameters.insert("stopPrice".into(), stop_price.to_string());
order_parameters.insert("stopPrice", stop_price.to_string());
}

if order.price != 0.0 {
order_parameters.insert("price".into(), order.price.to_string());
order_parameters.insert("timeInForce".into(), order.time_in_force.to_string());
order_parameters.insert("price", order.price.to_string());
order_parameters.insert("timeInForce", order.time_in_force.to_string());
}

if let Some(client_order_id) = order.new_client_order_id {
order_parameters.insert("newClientOrderId".into(), client_order_id);
order_parameters.insert("newClientOrderId", client_order_id);
}

order_parameters
}

fn build_quote_quantity_order(
&self, order: OrderQuoteQuantityRequest,
) -> BTreeMap<String, String> {
let mut order_parameters: BTreeMap<String, String> = BTreeMap::new();
) -> HashMap<&'static str, String> {
let mut order_parameters = HashMap::new();

order_parameters.insert("symbol".into(), order.symbol);
order_parameters.insert("side".into(), order.order_side.to_string());
order_parameters.insert("type".into(), order.order_type.to_string());
order_parameters.insert("quoteOrderQty".into(), order.quote_order_qty.to_string());
order_parameters.insert("symbol", order.symbol);
order_parameters.insert("side", order.order_side.to_string());
order_parameters.insert("type", order.order_type.to_string());
order_parameters.insert("quoteOrderQty", order.quote_order_qty.to_string());

if order.price != 0.0 {
order_parameters.insert("price".into(), order.price.to_string());
order_parameters.insert("timeInForce".into(), order.time_in_force.to_string());
order_parameters.insert("price", order.price.to_string());
order_parameters.insert("timeInForce", order.time_in_force.to_string());
}

if let Some(client_order_id) = order.new_client_order_id {
order_parameters.insert("newClientOrderId".into(), client_order_id);
order_parameters.insert("newClientOrderId", client_order_id);
}

order_parameters
Expand Down
78 changes: 36 additions & 42 deletions src/futures/account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::BTreeMap;
use std::collections::HashMap;
use std::fmt::Display;

use crate::util::build_signed_request;
Expand Down Expand Up @@ -239,9 +239,9 @@ impl FuturesAccount {
where
S: Into<String>,
{
let mut parameters = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("orderId".into(), order_id.to_string());
let mut parameters = HashMap::new();
parameters.insert("symbol", symbol.into());
parameters.insert("orderId", order_id.to_string());

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand All @@ -254,9 +254,9 @@ impl FuturesAccount {
where
S: Into<String>,
{
let mut parameters = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("origClientOrderId".into(), orig_client_order_id);
let mut parameters = HashMap::new();
parameters.insert("symbol", symbol.into());
parameters.insert("origClientOrderId", orig_client_order_id);

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand Down Expand Up @@ -343,50 +343,44 @@ impl FuturesAccount {
.post_signed(API::Futures(Futures::Order), request)
}

fn build_order(&self, order: OrderRequest) -> BTreeMap<String, String> {
let mut parameters = BTreeMap::new();
parameters.insert("symbol".into(), order.symbol);
parameters.insert("side".into(), order.side.to_string());
parameters.insert("type".into(), order.order_type.to_string());
fn build_order(&self, order: OrderRequest) -> HashMap<&'static str, String> {
let mut parameters = HashMap::new();
parameters.insert("symbol", order.symbol);
parameters.insert("side", order.side.to_string());
parameters.insert("type", order.order_type.to_string());

if let Some(position_side) = order.position_side {
parameters.insert("positionSide".into(), position_side.to_string());
parameters.insert("positionSide", position_side.to_string());
}
if let Some(time_in_force) = order.time_in_force {
parameters.insert("timeInForce".into(), time_in_force.to_string());
parameters.insert("timeInForce", time_in_force.to_string());
}
if let Some(qty) = order.qty {
parameters.insert("quantity".into(), qty.to_string());
parameters.insert("quantity", qty.to_string());
}
if let Some(reduce_only) = order.reduce_only {
parameters.insert("reduceOnly".into(), reduce_only.to_string().to_uppercase());
parameters.insert("reduceOnly", reduce_only.to_string().to_uppercase());
}
if let Some(price) = order.price {
parameters.insert("price".into(), price.to_string());
parameters.insert("price", price.to_string());
}
if let Some(stop_price) = order.stop_price {
parameters.insert("stopPrice".into(), stop_price.to_string());
parameters.insert("stopPrice", stop_price.to_string());
}
if let Some(close_position) = order.close_position {
parameters.insert(
"closePosition".into(),
close_position.to_string().to_uppercase(),
);
parameters.insert("closePosition", close_position.to_string().to_uppercase());
}
if let Some(activation_price) = order.activation_price {
parameters.insert("activationPrice".into(), activation_price.to_string());
parameters.insert("activationPrice", activation_price.to_string());
}
if let Some(callback_rate) = order.callback_rate {
parameters.insert("callbackRate".into(), callback_rate.to_string());
parameters.insert("callbackRate", callback_rate.to_string());
}
if let Some(working_type) = order.working_type {
parameters.insert("workingType".into(), working_type.to_string());
parameters.insert("workingType", working_type.to_string());
}
if let Some(price_protect) = order.price_protect {
parameters.insert(
"priceProtect".into(),
price_protect.to_string().to_uppercase(),
);
parameters.insert("priceProtect", price_protect.to_string().to_uppercase());
}

parameters
Expand All @@ -396,24 +390,24 @@ impl FuturesAccount {
where
S: Into<String>,
{
let mut parameters = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
let mut parameters = HashMap::new();
parameters.insert("symbol", symbol.into());

let request = build_signed_request(parameters, self.recv_window)?;
self.client
.get_signed(API::Futures(Futures::PositionRisk), Some(request))
}

pub fn account_information(&self) -> Result<AccountInformation> {
let parameters = BTreeMap::new();
let parameters = HashMap::new();

let request = build_signed_request(parameters, self.recv_window)?;
self.client
.get_signed(API::Futures(Futures::Account), Some(request))
}

pub fn account_balance(&self) -> Result<Vec<AccountBalance>> {
let parameters = BTreeMap::new();
let parameters = HashMap::new();

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand All @@ -426,19 +420,19 @@ impl FuturesAccount {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
parameters.insert("leverage".into(), leverage.to_string());
let mut parameters: HashMap<&'static str, String> = HashMap::new();
parameters.insert("symbol", symbol.into());
parameters.insert("leverage", leverage.to_string());

let request = build_signed_request(parameters, self.recv_window)?;
self.client
.post_signed(API::Futures(Futures::ChangeInitialLeverage), request)
}

pub fn change_position_mode(&self, dual_side_position: bool) -> Result<()> {
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
let mut parameters: HashMap<&'static str, String> = HashMap::new();
let dual_side = if dual_side_position { "true" } else { "false" };
parameters.insert("dualSidePosition".into(), dual_side.into());
parameters.insert("dualSidePosition", dual_side.into());

let request = build_signed_request(parameters, self.recv_window)?;
self.client
Expand All @@ -450,8 +444,8 @@ impl FuturesAccount {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
let mut parameters: HashMap<&'static str, String> = HashMap::new();
parameters.insert("symbol", symbol.into());
let request = build_signed_request(parameters, self.recv_window)?;
self.client
.delete_signed::<Empty>(API::Futures(Futures::AllOpenOrders), Some(request))
Expand All @@ -462,8 +456,8 @@ impl FuturesAccount {
where
S: Into<String>,
{
let mut parameters: BTreeMap<String, String> = BTreeMap::new();
parameters.insert("symbol".into(), symbol.into());
let mut parameters: HashMap<&'static str, String> = HashMap::new();
parameters.insert("symbol", symbol.into());
let request = build_signed_request(parameters, self.recv_window)?;
self.client
.get_signed(API::Futures(Futures::OpenOrders), Some(request))
Expand Down
Loading