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

Delete unnecessary codes

Browse Source
This commit is contained in:
Sik Yoon 2023-08-12 18:17:07 +09:00
parent 052b5589d3
commit 7fc7aa8a25
1 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/coex/exchange_team.rs
View File

@ -143,14 +143,7 @@ pub async fn buy_coin(
&& element.already_buy == 0 && element.already_buy == 0
&& server_epoch - element.registered_server_epoch <= 600_000 && server_epoch - element.registered_server_epoch <= 600_000
// 600_000 (600 secs = 10 mins) // 600_000 (600 secs = 10 mins)
// if price_index.is_some() && element.already_buy == 0 && marketcap_vec.first().unwrap().market_cap_index <= -10.0 && server_epoch - element.registered_server_epoch <= 600_000 // 600_000 (600 secs = 10 mins)
{ {
// && (market_cap_info.first().unwrap().market_cap_index <= 10.0) {
// let current_price: Decimal = rust_decimal::prelude::FromPrimitive::from_f64(coin_price_vec[price_index.unwrap()].current_price).unwrap();
// if current_price <= element.suggested_price || ((decimal_sub(decimal_div(decimal_sub(current_price, element.suggested_price), element.suggested_price), dec!(1))) <= dec!(0.005) && current_price > element.suggested_price) {
// filtered_suggested_coin_vec.push(element);
// }
filtered_suggested_coin_vec.push(element); filtered_suggested_coin_vec.push(element);
delete_condition.push_str("id = "); delete_condition.push_str("id = ");
delete_condition.push_str(element.id.to_string().as_str()); delete_condition.push_str(element.id.to_string().as_str());
@ -162,32 +155,10 @@ pub async fn buy_coin(
delete_condition.push_str(" OR "); delete_condition.push_str(" OR ");
is_exist_delete_symbol = true; is_exist_delete_symbol = true;
} }
// if price_index.is_some() && (element.registerer != 1 || element.registerer != 5 || element.registerer != 6) && server_epoch - element.registered_server_epoch <= 7_200_000 // 7_200_000 (120 mins)
// // && market_cap_info.first().unwrap().negative_buy_signal == 1 {
// && (market_cap_info.first().unwrap().market_cap_index <= 10.0) && (market_cap_info.first().unwrap().liquidation_signal != 1) {
// let current_price: Decimal = rust_decimal::prelude::FromPrimitive::from_f64(coin_price_vec[price_index.unwrap()].current_price).unwrap();
// if current_price < element.suggested_price || ((current_price - element.suggested_price)/element.suggested_price <= dec!(0.005) && current_price > element.suggested_price) {
// filtered_suggested_coin_vec.push(element);
// }
// delete_condition.push_str("id = ");
// delete_condition.push_str(element.id.to_string().as_str());
// delete_condition.push_str(" OR ");
// } else if price_index.is_some() && (element.registerer == 1 || element.registerer == 5 || element.registerer == 6 ) && server_epoch - element.registered_server_epoch <= 10_000 // 10000 (10 secs)
// && ((market_cap_info.first().unwrap().market_cap_index >= 0.0 && market_cap_info.first().unwrap().liquidation_signal == 0) || market_cap_info.first().unwrap().negative_buy_signal == 1) {
// let current_price: Decimal = rust_decimal::prelude::FromPrimitive::from_f64(coin_price_vec[price_index.unwrap()].current_price).unwrap();
// if current_price <= element.suggested_price {
// filtered_suggested_coin_vec.push(element);
// }
// delete_condition.push_str("id = ");
// delete_condition.push_str(element.id.to_string().as_str());
// delete_condition.push_str(" OR ");
// }
} }
if !filtered_suggested_coin_vec.is_empty() { if !filtered_suggested_coin_vec.is_empty() {
let available_usdt = fetch_available_usdt().await; let available_usdt = get_available_usdt().await;
let vec_len = Decimal::new(filtered_suggested_coin_vec.len() as i64, 0); let vec_len = Decimal::new(filtered_suggested_coin_vec.len() as i64, 0);
let weighted_unit_usdt = let weighted_unit_usdt =
(((available_usdt / vec_len).trunc() / unit_trade_usdt).trunc() * unit_trade_usdt) (((available_usdt / vec_len).trunc() / unit_trade_usdt).trunc() * unit_trade_usdt)
@ -226,10 +197,6 @@ pub async fn buy_coin(
let trade_fee = trade_fee_result.unwrap().takercommission; let trade_fee = trade_fee_result.unwrap().takercommission;
// buy the suggested coin and transfer it into [buy_ordered_coin_list] // buy the suggested coin and transfer it into [buy_ordered_coin_list]
// let price_index = coin_price_vec.iter().position(|x| *x.symbol == element.symbol);
// let current_price: Decimal = rust_decimal::prelude::FromPrimitive::from_f64(coin_price_vec[price_index.unwrap()].current_price).unwrap();
// let order_price = current_price;
let order_price = element.suggested_price; let order_price = element.suggested_price;
if filtered_suggested_coin_vec.len() >= 10 if filtered_suggested_coin_vec.len() >= 10
&& weighted_unit_usdt > unit_trade_usdt && weighted_unit_usdt > unit_trade_usdt
@ -265,6 +232,7 @@ pub async fn buy_coin(
.to_f64() .to_f64()
.unwrap() .unwrap()
* 100.0; * 100.0;
if (element.registerer == 5 || element.registerer == 6) if (element.registerer == 5 || element.registerer == 6)
&& expected_pure_profit_percent < -0.5 && expected_pure_profit_percent < -0.5
{ {
@ -415,7 +383,7 @@ pub async fn buy_coin_for_test(
filtered_suggested_coin_vec.push(element); filtered_suggested_coin_vec.push(element);
} }
let available_usdt = fetch_available_usdt().await; let available_usdt = get_available_usdt().await;
let vec_len = Decimal::new(filtered_suggested_coin_vec.len() as i64, 0); let vec_len = Decimal::new(filtered_suggested_coin_vec.len() as i64, 0);
let weighted_unit_usdt = let weighted_unit_usdt =
(((available_usdt / vec_len).trunc() / unit_trade_usdt).trunc() * unit_trade_usdt).trunc(); (((available_usdt / vec_len).trunc() / unit_trade_usdt).trunc() * unit_trade_usdt).trunc();
@ -1128,7 +1096,7 @@ pub async fn select_marketcap() -> Vec<MarketCapIndex> {
) )
.await .await
.unwrap(); .unwrap();
select_result select_result
} }