Merge pull request #2266 from get10101/chore/do-not-spawn-on-trade-ex…

…ecution chore: Do not spawn on trade execution
get10101 · Mar 18, 2024 · 1ce3059 · 1ce3059
2 parents 81d49ef + 90b9a34
commit 1ce3059
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 34 deletions.
diff --git a/coordinator/src/orderbook/async_match.rs b/coordinator/src/orderbook/async_match.rs
@@ -128,23 +128,20 @@ async fn process_pending_match(
 
         tracing::info!(trader_id = %order.trader_id, order_id = %order.id, order_reason = ?order.order_reason, "Executing trade for match");
         let trade_executor = TradeExecutor::new(node, notifier);
-
-        tokio::spawn(async move {
-            trade_executor
-                .execute(&TradeAndChannelParams {
-                    trade_params: TradeParams {
-                        pubkey: trader_id,
-                        contract_symbol: ContractSymbol::BtcUsd,
-                        leverage: order.leverage,
-                        quantity: order.quantity.to_f32().expect("to fit into f32"),
-                        direction: order.direction,
-                        filled_with,
-                    },
-                    trader_reserve: channel_opening_params.map(|c| c.trader_reserve),
-                    coordinator_reserve: channel_opening_params.map(|c| c.coordinator_reserve),
-                })
-                .await;
-        });
+        trade_executor
+            .execute(&TradeAndChannelParams {
+                trade_params: TradeParams {
+                    pubkey: trader_id,
+                    contract_symbol: ContractSymbol::BtcUsd,
+                    leverage: order.leverage,
+                    quantity: order.quantity.to_f32().expect("to fit into f32"),
+                    direction: order.direction,
+                    filled_with,
+                },
+                trader_reserve: channel_opening_params.map(|c| c.trader_reserve),
+                coordinator_reserve: channel_opening_params.map(|c| c.coordinator_reserve),
+            })
+            .await;
     }
 
     Ok(())

diff --git a/coordinator/src/orderbook/trading.rs b/coordinator/src/orderbook/trading.rs
@@ -321,23 +321,20 @@ pub async fn process_new_market_order(
     if node.inner.is_connected(order.trader_id) {
         tracing::info!(trader_id = %order.trader_id, order_id = %order.id, order_reason = ?order.order_reason, "Executing trade for match");
         let trade_executor = TradeExecutor::new(node.clone(), notifier);
-
-        tokio::spawn(async move {
-            trade_executor
-                .execute(&TradeAndChannelParams {
-                    trade_params: TradeParams {
-                        pubkey: order.trader_id,
-                        contract_symbol: ContractSymbol::BtcUsd,
-                        leverage: order.leverage,
-                        quantity: order.quantity.to_f32().expect("to fit into f32"),
-                        direction: order.direction,
-                        filled_with: matched_orders.taker_match.filled_with,
-                    },
-                    trader_reserve: channel_opening_params.map(|p| p.trader_reserve),
-                    coordinator_reserve: channel_opening_params.map(|p| p.coordinator_reserve),
-                })
-                .await;
-        });
+        trade_executor
+            .execute(&TradeAndChannelParams {
+                trade_params: TradeParams {
+                    pubkey: order.trader_id,
+                    contract_symbol: ContractSymbol::BtcUsd,
+                    leverage: order.leverage,
+                    quantity: order.quantity.to_f32().expect("to fit into f32"),
+                    direction: order.direction,
+                    filled_with: matched_orders.taker_match.filled_with,
+                },
+                trader_reserve: channel_opening_params.map(|p| p.trader_reserve),
+                coordinator_reserve: channel_opening_params.map(|p| p.coordinator_reserve),
+            })
+            .await;
     } else {
         match order.order_reason {
             OrderReason::Manual => {