Sik/tradingbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unnecessary code

Browse Source
This commit is contained in:
Sik Yoon 2024-05-25 02:48:59 +09:00
parent 2f83c28077
commit ddd690fd66
1 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/future/order.rs
View File

@ -60,7 +60,6 @@ pub async fn entry_position(
let lot_step_size = futures_exchange_info.stepsize; let lot_step_size = futures_exchange_info.stepsize;
let tick_size = futures_exchange_info.ticksize; let tick_size = futures_exchange_info.ticksize;
let base_asset_precision = futures_exchange_info.base_asset_precision; let base_asset_precision = futures_exchange_info.base_asset_precision;
let trade_fee = future_trade_fee.maker_fee_percent;
let entry_price = rust_decimal::prelude::FromPrimitive::from_f64(*price_map.get(&element.symbol).unwrap()).unwrap(); let entry_price = rust_decimal::prelude::FromPrimitive::from_f64(*price_map.get(&element.symbol).unwrap()).unwrap();
// calculate minimum order usdt >= unit_trade_usdt // calculate minimum order usdt >= unit_trade_usdt
@ -297,22 +296,22 @@ pub async fn limit_order_close(
} else { } else {
url_build.push_str("&side=BUY"); url_build.push_str("&side=BUY");
} }
url_build.push_str("&type=LIMIT"); url_build.push_str("&type=MARKET");
url_build.push_str("&quantity="); url_build.push_str("&quantity=");
url_build.push_str(order_quantity.to_string().as_str()); url_build.push_str(order_quantity.to_string().as_str());
url_build.push_str("&price="); // url_build.push_str("&price=");
url_build.push_str(order_price.to_string().as_str()); // url_build.push_str(order_price.to_string().as_str());
match tif { // match tif {
TimeInForce::Gtc => { // TimeInForce::Gtc => {
url_build.push_str("&timeInForce=GTC"); // url_build.push_str("&timeInForce=GTC");
} // }
TimeInForce::Ioc => { // TimeInForce::Ioc => {
url_build.push_str("&timeInForce=IOC"); // url_build.push_str("&timeInForce=IOC");
} // }
TimeInForce::Fok => { // TimeInForce::Fok => {
url_build.push_str("&timeInForce=FOK"); // url_build.push_str("&timeInForce=FOK");
} // }
} // }
hmac_signature(&mut url_build).await; hmac_signature(&mut url_build).await;
url.push_str(&url_build); url.push_str(&url_build);
@ -499,7 +498,6 @@ pub async fn cancel_open_positioning_order(
// calculate values to be updated // calculate values to be updated
if future_trade_fee.user_level.is_some() { if future_trade_fee.user_level.is_some() {
let trade_fee = future_trade_fee.maker_fee_percent;
let base_qty_ordered = rust_decimal::prelude::FromStr::from_str( let base_qty_ordered = rust_decimal::prelude::FromStr::from_str(
T.get("executedQty").unwrap().as_str().unwrap(), T.get("executedQty").unwrap().as_str().unwrap(),
) )
@ -597,39 +595,37 @@ pub async fn query_open_positioning_order(
value_build.push_str(T.get("status").unwrap().as_str().unwrap()); value_build.push_str(T.get("status").unwrap().as_str().unwrap());
// calculate values to be updated // calculate values to be updated
if future_trade_fee.user_level.is_some() { let base_qty_ordered = rust_decimal::prelude::FromStr::from_str(
let trade_fee = future_trade_fee.maker_fee_percent; T.get("executedQty").unwrap().as_str().unwrap(),
let base_qty_ordered = rust_decimal::prelude::FromStr::from_str( )
T.get("executedQty").unwrap().as_str().unwrap(), .unwrap();
)
let cummulative_quote_qty = rust_decimal::prelude::FromStr::from_str(
T.get("cumQuote").unwrap().as_str().unwrap(),
)
.unwrap();
let entry_price = decimal_div(cummulative_quote_qty, base_qty_ordered)
.round_dp_with_strategy(8, RoundingStrategy::ToZero);
let update_values = vec![
(String::from("status"), value_build), // status
(String::from("used_usdt"), cummulative_quote_qty.to_string()), // used_usdt
(String::from("entry_price"), entry_price.to_string()), // entry_price
(String::from("base_qty_ordered"), base_qty_ordered.to_string()), // base_qty_ordered
];
let update_condition = vec![
(String::from("order_id"), order.order_id.to_string()),
(String::from("symbol"), order.symbol.clone()),
];
update_record2(&table_name, &update_values, &update_condition)
.await
.unwrap(); .unwrap();
let cummulative_quote_qty = rust_decimal::prelude::FromStr::from_str( if T.get("status").unwrap().as_str().unwrap() == "FILLED" {
T.get("cumQuote").unwrap().as_str().unwrap(), println!("Positioning {} {}", order.position, order.symbol);
)
.unwrap();
let entry_price = decimal_div(cummulative_quote_qty, base_qty_ordered)
.round_dp_with_strategy(8, RoundingStrategy::ToZero);
let update_values = vec![
(String::from("status"), value_build), // status
(String::from("used_usdt"), cummulative_quote_qty.to_string()), // used_usdt
(String::from("entry_price"), entry_price.to_string()), // entry_price
(String::from("base_qty_ordered"), base_qty_ordered.to_string()), // base_qty_ordered
];
let update_condition = vec![
(String::from("order_id"), order.order_id.to_string()),
(String::from("symbol"), order.symbol.clone()),
];
update_record2(&table_name, &update_values, &update_condition)
.await
.unwrap();
if T.get("status").unwrap().as_str().unwrap() == "FILLED" {
println!("Positioning {} {}", order.position, order.symbol);
}
} }
} else if T.get("status").unwrap().as_str().unwrap() == "CANCELED" { } else if T.get("status").unwrap().as_str().unwrap() == "CANCELED" {
let update_table_name = String::from("future_ordered_coin_list"); let update_table_name = String::from("future_ordered_coin_list");
let update_values = vec![(String::from("status"), String::from("CANCELED"))]; let update_values = vec![(String::from("status"), String::from("CANCELED"))];