Remove redundant polymorphic traits

eruditis · Jun 1, 2024 · bd12777 · bd12777
1 parent 6d01698
commit bd12777
Show file tree

Hide file tree

Showing 18 changed files with 181 additions and 359 deletions.
diff --git a/nautilus_core/common/src/cache/core.rs b/nautilus_core/common/src/cache/core.rs
@@ -38,11 +38,6 @@ use nautilus_model::{
     instruments::{any::InstrumentAny, synthetic::SyntheticInstrument},
     orderbook::book::OrderBook,
     orders::{any::OrderAny, list::OrderList},
-    polymorphism::{
-        GetClientOrderId, GetEmulationTrigger, GetExecAlgorithmId, GetExecSpawnId, GetInstrumentId,
-        GetOrderFilledQty, GetOrderLeavesQty, GetOrderQuantity, GetOrderSide, GetPositionId,
-        GetStrategyId, GetVenueOrderId, IsClosed, IsInflight, IsOpen,
-    },
     position::Position,
     types::{currency::Currency, price::Price, quantity::Quantity},
 };
@@ -2526,7 +2521,6 @@ mod tests {
             synthetic::SyntheticInstrument,
         },
         orders::stubs::{TestOrderEventStubs, TestOrderStubs},
-        polymorphism::{GetClientOrderId, GetOrderStatus, GetVenueOrderId, IsClosed, IsOpen},
         types::{price::Price, quantity::Quantity},
     };
     use rstest::*;

diff --git a/nautilus_core/common/src/factories.rs b/nautilus_core/common/src/factories.rs
@@ -149,9 +149,6 @@ pub mod tests {
         identifiers::{
             client_order_id::ClientOrderId, instrument_id::InstrumentId, order_list_id::OrderListId,
         },
-        polymorphism::{
-            GetClientOrderId, GetExecAlgorithmId, GetInstrumentId, GetOrderQuantity, GetOrderSide,
-        },
     };
     use rstest::rstest;
 

diff --git a/nautilus_core/execution/src/matching_core.rs b/nautilus_core/execution/src/matching_core.rs
@@ -27,7 +27,6 @@ use nautilus_model::{
         base::OrderError,
         market::MarketOrder,
     },
-    polymorphism::{GetClientOrderId, GetLimitPrice, GetOrderSideSpecified, GetStopPrice},
     types::price::Price,
 };
 

diff --git a/nautilus_core/infrastructure/tests/test_cache_database_postgres.rs b/nautilus_core/infrastructure/tests/test_cache_database_postgres.rs
@@ -78,7 +78,6 @@ mod tests {
             Instrument,
         },
         orders::stubs::{TestOrderEventStubs, TestOrderStubs},
-        polymorphism::GetClientOrderId,
         types::{currency::Currency, price::Price, quantity::Quantity},
     };
     use serial_test::serial;

diff --git a/nautilus_core/model/src/data/bar.rs b/nautilus_core/model/src/data/bar.rs
@@ -27,10 +27,10 @@ use indexmap::IndexMap;
 use nautilus_core::{nanos::UnixNanos, serialization::Serializable};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
+use super::GetTsInit;
 use crate::{
     enums::{AggregationSource, BarAggregation, PriceType},
     identifiers::instrument_id::InstrumentId,
-    polymorphism::GetTsInit,
     types::{price::Price, quantity::Quantity},
 };
 

diff --git a/nautilus_core/model/src/data/delta.rs b/nautilus_core/model/src/data/delta.rs
@@ -25,11 +25,13 @@ use indexmap::IndexMap;
 use nautilus_core::{nanos::UnixNanos, serialization::Serializable};
 use serde::{Deserialize, Serialize};
 
-use super::order::{BookOrder, NULL_ORDER};
+use super::{
+    order::{BookOrder, NULL_ORDER},
+    GetTsInit,
+};
 use crate::{
     enums::{BookAction, RecordFlag},
     identifiers::instrument_id::InstrumentId,
-    polymorphism::GetTsInit,
 };
 
 /// Represents a single change/delta in an order book.

diff --git a/nautilus_core/model/src/data/deltas.rs b/nautilus_core/model/src/data/deltas.rs
@@ -23,8 +23,8 @@ use std::{
 
 use nautilus_core::nanos::UnixNanos;
 
-use super::delta::OrderBookDelta;
-use crate::{identifiers::instrument_id::InstrumentId, polymorphism::GetTsInit};
+use super::{delta::OrderBookDelta, GetTsInit};
+use crate::identifiers::instrument_id::InstrumentId;
 
 /// Represents a grouped batch of `OrderBookDelta` updates for an `OrderBook`.
 ///

diff --git a/nautilus_core/model/src/data/depth.rs b/nautilus_core/model/src/data/depth.rs
@@ -24,8 +24,8 @@ use indexmap::IndexMap;
 use nautilus_core::{nanos::UnixNanos, serialization::Serializable};
 use serde::{Deserialize, Serialize};
 
-use super::order::BookOrder;
-use crate::{identifiers::instrument_id::InstrumentId, polymorphism::GetTsInit};
+use super::{order::BookOrder, GetTsInit};
+use crate::identifiers::instrument_id::InstrumentId;
 
 pub const DEPTH10_LEN: usize = 10;
 

diff --git a/nautilus_core/model/src/data/mod.rs b/nautilus_core/model/src/data/mod.rs
@@ -31,7 +31,6 @@ use self::{
     bar::Bar, delta::OrderBookDelta, deltas::OrderBookDeltas_API, depth::OrderBookDepth10,
     quote::QuoteTick, trade::TradeTick,
 };
-use crate::polymorphism::GetTsInit;
 
 /// A built-in Nautilus data type.
 ///
@@ -49,6 +48,10 @@ pub enum Data {
     Bar(Bar),
 }
 
+pub trait GetTsInit {
+    fn ts_init(&self) -> UnixNanos;
+}
+
 impl GetTsInit for Data {
     fn ts_init(&self) -> UnixNanos {
         match self {

diff --git a/nautilus_core/model/src/data/quote.rs b/nautilus_core/model/src/data/quote.rs
@@ -27,10 +27,10 @@ use indexmap::IndexMap;
 use nautilus_core::{correctness::check_equal_u8, nanos::UnixNanos, serialization::Serializable};
 use serde::{Deserialize, Serialize};
 
+use super::GetTsInit;
 use crate::{
     enums::PriceType,
     identifiers::instrument_id::InstrumentId,
-    polymorphism::GetTsInit,
     types::{fixed::FIXED_PRECISION, price::Price, quantity::Quantity},
 };
 

diff --git a/nautilus_core/model/src/data/trade.rs b/nautilus_core/model/src/data/trade.rs
@@ -26,10 +26,10 @@ use indexmap::IndexMap;
 use nautilus_core::{nanos::UnixNanos, serialization::Serializable};
 use serde::{Deserialize, Serialize};
 
+use super::GetTsInit;
 use crate::{
     enums::AggressorSide,
     identifiers::{instrument_id::InstrumentId, trade_id::TradeId},
-    polymorphism::GetTsInit,
     types::{price::Price, quantity::Quantity},
 };
 

diff --git a/nautilus_core/model/src/lib.rs b/nautilus_core/model/src/lib.rs
@@ -37,7 +37,6 @@ pub mod instruments;
 pub mod macros;
 pub mod orderbook;
 pub mod orders;
-pub mod polymorphism;
 pub mod position;
 pub mod types;
 pub mod venues;