Refactor enum dispatch (#2461)

Author: filipmacek

crates/model/src/accounts/any.rs

@@ -29,7 +29,7 @@ use crate::{
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[enum_dispatch]
+#[enum_dispatch(Account)]
 pub enum AccountAny {
     Margin(MarginAccount),
     Cash(CashAccount),

crates/model/src/accounts/mod.rs

@@ -40,7 +40,7 @@ use crate::{
     types::{AccountBalance, Currency, Money, Price, Quantity},
 };
 
-#[enum_dispatch(AccountAny)]
+#[enum_dispatch]
 pub trait Account: 'static + Send {
     fn id(&self) -> AccountId;
     fn account_type(&self) -> AccountType;

crates/model/src/instruments/any.rs

@@ -25,7 +25,7 @@ use super::{
 use crate::types::{Price, Quantity};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[enum_dispatch]
+#[enum_dispatch(Instrument)]
 pub enum InstrumentAny {
     Betting(BettingInstrument),
     BinaryOption(BinaryOption),

crates/model/src/instruments/mod.rs

@@ -52,7 +52,7 @@ use crate::{
     types::{Currency, Money, Price, Quantity},
 };
 
-#[enum_dispatch(InstrumentAny)]
+#[enum_dispatch]
 pub trait Instrument: 'static + Send {
     fn into_any(self) -> InstrumentAny;
     fn id(&self) -> InstrumentId;

crates/model/src/orders/any.rs

@@ -27,7 +27,7 @@ use super::{
 use crate::{events::OrderEventAny, types::Price};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[enum_dispatch]
+#[enum_dispatch(Order)]
 pub enum OrderAny {
     Limit(LimitOrder),
     LimitIfTouched(LimitIfTouchedOrder),
@@ -171,7 +171,7 @@ impl From<LimitOrderAny> for OrderAny {
 }
 
 #[derive(Clone, Debug)]
-#[enum_dispatch]
+#[enum_dispatch(Order)]
 pub enum PassiveOrderAny {
     Limit(LimitOrderAny),
     Stop(StopOrderAny),
@@ -198,7 +198,7 @@ impl PartialEq for PassiveOrderAny {
 }
 
 #[derive(Clone, Debug)]
-#[enum_dispatch]
+#[enum_dispatch(Order)]
 pub enum LimitOrderAny {
     Limit(LimitOrder),
     MarketToLimit(MarketToLimitOrder),
@@ -230,7 +230,7 @@ impl PartialEq for LimitOrderAny {
 }
 
 #[derive(Clone, Debug)]
-#[enum_dispatch]
+#[enum_dispatch(Order)]
 pub enum StopOrderAny {
     LimitIfTouched(LimitIfTouchedOrder),
     MarketIfTouched(MarketIfTouchedOrder),

crates/model/src/orders/mod.rs

@@ -199,10 +199,7 @@ impl OrderStatus {
     }
 }
 
-#[enum_dispatch(OrderAny)]
-#[enum_dispatch(PassiveOrderAny)]
-#[enum_dispatch(LimitOrderAny)]
-#[enum_dispatch(StopOrderAny)]
+#[enum_dispatch]
 pub trait Order: 'static + Send {
     fn into_any(self) -> OrderAny;
     fn status(&self) -> OrderStatus;