math tests

.gitignore

@@ -8,4 +8,7 @@ coverage
 .vscode
 note.txt
 log.txt
-dependencies
+dependencies
+
+/master
+/development

_tests/match_test/match_orders_cases.rs

@@ -6,6 +6,16 @@ mod success {
     use super::*;
 
     // ✅ buyOrder.orderPrice > sellOrder.orderPrice & buyOrder.baseSize > sellOrder.baseSize
+    // constants
+    // balances check
+    // alice deposit
+    // deposit check
+    // create a buy order
+    // deposited balance check and order check
+    // same stuff for a sell order
+    // match orders
+    // close order in nessesary
+    // deposited balances check
     #[tokio::test]
     async fn greater_buy_price_and_greater_buy_amount() {
         let buy_price = 46_000_f64;

market-contract/src/data_structures/asset_type.sw

@@ -19,3 +19,14 @@ impl Hash for AssetType {
         }
     }
 }
+
+
+// impl core::ops::Eq for AssetType {
+//     fn eq(self, other: Self) -> bool {
+//         match (self, other) {
+//             (Self::Base, Self::Base) => true,
+//             (Self::Quote, Self::Quote) => true,
+//             _ => false,
+//         }
+//     }
+// }

market-contract/src/data_structures/order.sw

@@ -50,29 +50,4 @@ impl Order {
         require(price != 0, OrderError::PriceCannotBeZero);
         self.price = price;
     }
-
-    //     #[storage(read)]
-    //     pub fn calculate_deposit(
-    //         self,
-    //         BASE_ASSET_DECIMALS: u32,
-    //         PRICE_DECIMALS: u32,
-    //         QUOTE_TOKEN_DECIMALS: u32,
-    //         QUOTE_TOKEN: AssetId,
-    // ) -> Asset {
-    //         match self.order_type {
-    //             OrderType::Sell => Asset::new(self.amount, self.asset),
-    //             OrderType::Buy => {
-    //                 Asset::new(
-    //                     quote(
-    //                         self.amount,
-    //                         BASE_ASSET_DECIMALS,
-    //                         self.price,
-    //                         PRICE_DECIMALS,
-    //                         QUOTE_TOKEN_DECIMALS,
-    //                     ),
-    //                     QUOTE_TOKEN,
-    //                 )
-    //             },
-    //         }
-    //     }
 }

market-contract/src/data_structures/order_type.sw

@@ -28,4 +28,4 @@ impl Hash for OrderType {
             }
         }
     }
-}
+}

market-contract/src/interface.sw

@@ -25,7 +25,7 @@ abi Market {
     // fn fulfill(order_id: b256);
 
     #[storage(read, write)]
-    fn batch_fulfill(order_id: b256, orders: Vec<b256>);
+    fn batch_fulfill(order_sell_id: b256, order_buy_id: b256);
 
     #[storage(write)]
     fn set_fee(amount: u64, user: Option<Identity>);