feat: add date field so it can be queried

elys-network · Nov 29, 2023 · 7ecaecd · 7ecaecd
1 parent 2dfcef5
commit 7ecaecd
Show file tree

Hide file tree

Showing 15 changed files with 167 additions and 11 deletions.
diff --git a/src/action/execute/create_spot_order.rs b/src/action/execute/create_spot_order.rs
@@ -48,6 +48,7 @@ pub fn create_spot_order(
         info.sender.clone(),
         order_target_denom,
         &order_vec,
+        &env.block,
     );
 
     let bank_msg: BankMsg = BankMsg::Send {

diff --git a/src/tests/cancel_spot_order/process_spot_order_processing.rs b/src/tests/cancel_spot_order/process_spot_order_processing.rs
@@ -1,5 +1,5 @@
 use super::*;
-use cosmwasm_std::{coins, Coin};
+use cosmwasm_std::{coins, Coin, Timestamp};
 
 #[test]
 fn process_spot_order_processing() {
@@ -26,6 +26,10 @@ fn process_spot_order_processing() {
         owner_address: Addr::unchecked("user"),
         order_target_denom: "ubtc".to_string(),
         status: Status::Processed,
+        date: Date {
+            height: 20,
+            time: Timestamp::from_seconds(644),
+        },
     };
 
     // Create a mock message to instantiate the contract with the dummy order.

diff --git a/src/tests/cancel_spot_orders/successfully_cancel_orders.rs b/src/tests/cancel_spot_orders/successfully_cancel_orders.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Coin};
+use cosmwasm_std::{to_json_binary, Coin, Timestamp};
 
 use super::*;
 
@@ -22,6 +22,10 @@ fn successfully_cancel_orders() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -35,6 +39,10 @@ fn successfully_cancel_orders() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -48,6 +56,10 @@ fn successfully_cancel_orders() {
             owner_address: Addr::unchecked("user1"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -61,6 +73,10 @@ fn successfully_cancel_orders() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
     ];
 

diff --git a/src/tests/cancel_spot_orders/successfully_cancel_orders_id.rs b/src/tests/cancel_spot_orders/successfully_cancel_orders_id.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Coin};
+use cosmwasm_std::{to_json_binary, Coin, Timestamp};
 
 use super::*;
 
@@ -22,6 +22,10 @@ fn successfully_cancel_orders_ids() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -35,6 +39,10 @@ fn successfully_cancel_orders_ids() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -48,6 +56,10 @@ fn successfully_cancel_orders_ids() {
             owner_address: Addr::unchecked("user1"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -61,6 +73,10 @@ fn successfully_cancel_orders_ids() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
     ];
 

diff --git a/src/tests/cancel_spot_orders/successfully_cancel_orders_type.rs b/src/tests/cancel_spot_orders/successfully_cancel_orders_type.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_json_binary, Coin};
+use cosmwasm_std::{to_json_binary, Coin, Timestamp};
 
 use super::*;
 
@@ -22,6 +22,10 @@ fn successfully_cancel_orders_type() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -35,6 +39,10 @@ fn successfully_cancel_orders_type() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -48,6 +56,10 @@ fn successfully_cancel_orders_type() {
             owner_address: Addr::unchecked("user1"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -61,6 +73,10 @@ fn successfully_cancel_orders_type() {
             owner_address: Addr::unchecked("user"),
             order_target_denom: "".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
     ];
 

diff --git a/src/tests/get_spot_orders/get_spot_orders.rs b/src/tests/get_spot_orders/get_spot_orders.rs
@@ -1,3 +1,5 @@
+use cosmwasm_std::Timestamp;
+
 use crate::msg::query_resp::GetSpotOrdersResp;
 
 use super::*;
@@ -93,6 +95,10 @@ fn create_orders() -> Vec<SpotOrder> {
             owner_address: Addr::unchecked("userA"),
             order_target_denom: "btc".to_owned(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(600),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -106,6 +112,10 @@ fn create_orders() -> Vec<SpotOrder> {
             owner_address: Addr::unchecked("userB"),
             order_target_denom: "eth".to_owned(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(600),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -119,6 +129,10 @@ fn create_orders() -> Vec<SpotOrder> {
             owner_address: Addr::unchecked("userC"),
             order_target_denom: "xrp".to_owned(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(600),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -132,6 +146,10 @@ fn create_orders() -> Vec<SpotOrder> {
             owner_address: Addr::unchecked("userD"),
             order_target_denom: "ltc".to_owned(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(600),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitBuy,
@@ -145,6 +163,10 @@ fn create_orders() -> Vec<SpotOrder> {
             owner_address: Addr::unchecked("userE"),
             order_target_denom: "ada".to_owned(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(600),
+            },
         },
     ]
 }
diff --git a/src/tests/process_spot_order/succesful_process_limit_buy_order.rs b/src/tests/process_spot_order/succesful_process_limit_buy_order.rs
@@ -1,5 +1,5 @@
 use super::*;
-use cosmwasm_std::{coins, Coin};
+use cosmwasm_std::{coins, BlockInfo, Coin, Timestamp};
 
 // This test case verifies the successful processing of a "limit buy" order in the contract.
 // The scenario involves a "limit buy" order created by a user to buy ubtc at a specific price.
@@ -41,6 +41,11 @@ fn successful_process_limit_buy_order() {
         Addr::unchecked("user"),
         "ubtc".to_string(),
         &vec![],
+        &BlockInfo {
+            height: 50,
+            time: Timestamp::from_seconds(600),
+            chain_id: "elys-app".to_string(),
+        },
     );
 
     // Create a mock message to instantiate the contract with the dummy order.

diff --git a/src/tests/process_spot_order/successful_process_5_of_10_orders.rs b/src/tests/process_spot_order/successful_process_5_of_10_orders.rs
@@ -1,7 +1,7 @@
 use crate::tests::read_processed_order_id::read_processed_order_id;
 
 use super::*;
-use cosmwasm_std::Coin;
+use cosmwasm_std::{Coin, Timestamp};
 
 #[test]
 fn successful_process_5_of_10_orders() {
@@ -241,6 +241,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
                 rate: Decimal::from_atomics(Uint128::new(1700), 0).unwrap(),
             },
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -254,6 +258,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -267,6 +275,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -280,6 +292,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::StopLoss,
@@ -293,6 +309,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -306,6 +326,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -319,6 +343,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -332,6 +360,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -345,6 +377,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
         SpotOrder {
             order_type: OrderType::LimitSell,
@@ -358,6 +394,10 @@ fn create_dummy_orders() -> Vec<SpotOrder> {
             },
             order_target_denom: "usdc".to_string(),
             status: Status::NotProcessed,
+            date: Date {
+                height: 20,
+                time: Timestamp::from_seconds(500),
+            },
         },
     ]
 }
diff --git a/src/tests/process_spot_order/successful_process_limit_sell_order.rs b/src/tests/process_spot_order/successful_process_limit_sell_order.rs
@@ -1,7 +1,7 @@
 use crate::tests::read_processed_order_id::read_processed_order_id;
 
 use super::*;
-use cosmwasm_std::{coins, Coin};
+use cosmwasm_std::{coins, BlockInfo, Coin, Timestamp};
 // This test case verifies the successful processing of a "limit sell" order in the contract.
 // The scenario involves a "limit sell" order created by a user to sell BTC at a specific price.
 // - Initially, the BTC price is 20,000 USDC, and the order rate is set at 30,000 USDC per BTC.
@@ -47,6 +47,11 @@ fn successful_process_limit_sell_order() {
         Addr::unchecked("user"),
         "usdc".to_string(),
         &vec![],
+        &BlockInfo {
+            height: 50,
+            time: Timestamp::from_seconds(600),
+            chain_id: "elys-app".to_string(),
+        },
     );
 
     // Create a mock message to instantiate the contract with the dummy order.