Refine identifier imports in Rust

Author: cjdsellers

nautilus_core/accounting/src/account/base.rs

@@ -18,7 +18,7 @@ use std::collections::HashMap;
 use nautilus_model::{
     enums::{AccountType, LiquiditySide, OrderSide},
     events::{account::state::AccountState, order::filled::OrderFilled},
-    identifiers::account_id::AccountId,
+    identifiers::AccountId,
     instruments::any::InstrumentAny,
     position::Position,
     types::{

nautilus_core/accounting/src/account/cash.rs

@@ -23,7 +23,7 @@ use nautilus_common::interface::account::Account;
 use nautilus_model::{
     enums::{AccountType, LiquiditySide, OrderSide},
     events::{account::state::AccountState, order::filled::OrderFilled},
-    identifiers::account_id::AccountId,
+    identifiers::AccountId,
     instruments::any::InstrumentAny,
     position::Position,
     types::{
@@ -228,7 +228,7 @@ mod tests {
     use nautilus_model::{
         enums::{AccountType, LiquiditySide, OrderSide},
         events::account::{state::AccountState, stubs::*},
-        identifiers::{account_id::AccountId, position_id::PositionId},
+        identifiers::{position_id::PositionId, AccountId},
         instruments::{
             any::InstrumentAny, crypto_perpetual::CryptoPerpetual, currency_pair::CurrencyPair,
             equity::Equity, stubs::*, Instrument,

nautilus_core/accounting/src/account/margin.rs

@@ -26,7 +26,7 @@ use nautilus_common::interface::account::Account;
 use nautilus_model::{
     enums::{AccountType, LiquiditySide, OrderSide},
     events::{account::state::AccountState, order::filled::OrderFilled},
-    identifiers::{account_id::AccountId, instrument_id::InstrumentId},
+    identifiers::{AccountId, InstrumentId},
     instruments::{any::InstrumentAny, Instrument},
     position::Position,
     types::{
@@ -415,7 +415,7 @@ mod tests {
     use nautilus_common::interface::account::Account;
     use nautilus_model::{
         events::account::{state::AccountState, stubs::*},
-        identifiers::{instrument_id::InstrumentId, stubs::*},
+        identifiers::{stubs::*, InstrumentId},
         instruments::{crypto_perpetual::CryptoPerpetual, currency_pair::CurrencyPair, stubs::*},
         types::{currency::Currency, money::Money, price::Price, quantity::Quantity},
     };

nautilus_core/accounting/src/python/cash.rs

@@ -20,7 +20,7 @@ use nautilus_core::python::to_pyvalue_err;
 use nautilus_model::{
     enums::{AccountType, LiquiditySide, OrderSide},
     events::{account::state::AccountState, order::filled::OrderFilled},
-    identifiers::account_id::AccountId,
+    identifiers::AccountId,
     position::Position,
     python::instruments::pyobject_to_instrument_any,
     types::{currency::Currency, money::Money, price::Price, quantity::Quantity},

nautilus_core/accounting/src/python/margin.rs

@@ -16,7 +16,7 @@
 use nautilus_core::python::to_pyvalue_err;
 use nautilus_model::{
     events::account::state::AccountState,
-    identifiers::{account_id::AccountId, instrument_id::InstrumentId},
+    identifiers::{AccountId, InstrumentId},
     instruments::any::InstrumentAny,
     python::instruments::pyobject_to_instrument_any,
     types::{money::Money, price::Price, quantity::Quantity},

nautilus_core/accounting/src/stubs.rs

@@ -16,7 +16,7 @@
 use nautilus_common::{factories::OrderFactory, stubs::*};
 use nautilus_model::{
     enums::OrderSide,
-    identifiers::instrument_id::InstrumentId,
+    identifiers::InstrumentId,
     instruments::{any::InstrumentAny, currency_pair::CurrencyPair, stubs::audusd_sim},
     orders::stubs::TestOrderEventStubs,
     position::Position,

nautilus_core/adapters/src/databento/decode.rs

@@ -36,7 +36,7 @@ use nautilus_model::{
         AggregationSource, AggressorSide, AssetClass, BarAggregation, BookAction, FromU8,
         InstrumentClass, OptionKind, OrderSide, PriceType,
     },
-    identifiers::{instrument_id::InstrumentId, trade_id::TradeId},
+    identifiers::{InstrumentId, TradeId},
     instruments::{
         any::InstrumentAny, equity::Equity, futures_contract::FuturesContract,
         futures_spread::FuturesSpread, options_contract::OptionsContract,

nautilus_core/adapters/src/databento/live.rs

@@ -32,7 +32,7 @@ use nautilus_model::{
         Data,
     },
     enums::RecordFlag,
-    identifiers::{instrument_id::InstrumentId, symbol::Symbol, venue::Venue},
+    identifiers::{InstrumentId, Symbol, Venue},
     instruments::any::InstrumentAny,
 };
 use tokio::{

nautilus_core/adapters/src/databento/loader.rs

@@ -24,7 +24,7 @@ use fallible_streaming_iterator::FallibleStreamingIterator;
 use indexmap::IndexMap;
 use nautilus_model::{
     data::Data,
-    identifiers::{instrument_id::InstrumentId, symbol::Symbol, venue::Venue},
+    identifiers::{InstrumentId, Symbol, Venue},
     instruments::any::InstrumentAny,
     types::currency::Currency,
 };

nautilus_core/adapters/src/databento/python/historical.rs

@@ -27,7 +27,7 @@ use nautilus_core::{
 use nautilus_model::{
     data::{bar::Bar, quote::QuoteTick, trade::TradeTick, Data},
     enums::BarAggregation,
-    identifiers::{instrument_id::InstrumentId, symbol::Symbol, venue::Venue},
+    identifiers::{InstrumentId, Symbol, Venue},
     python::instruments::instrument_any_to_pyobject,
     types::currency::Currency,
 };

nautilus_core/adapters/src/databento/python/live.rs

@@ -19,7 +19,7 @@ use databento::{dbn, live::Subscription};
 use indexmap::IndexMap;
 use nautilus_core::python::{to_pyruntime_err, to_pyvalue_err};
 use nautilus_model::{
-    identifiers::venue::Venue,
+    identifiers::Venue,
     python::{data::data_to_pycapsule, instruments::instrument_any_to_pyobject},
 };
 use pyo3::prelude::*;

nautilus_core/adapters/src/databento/python/loader.rs

@@ -22,7 +22,7 @@ use nautilus_model::{
         bar::Bar, delta::OrderBookDelta, depth::OrderBookDepth10, quote::QuoteTick,
         trade::TradeTick, Data,
     },
-    identifiers::{instrument_id::InstrumentId, venue::Venue},
+    identifiers::{InstrumentId, Venue},
     python::instruments::instrument_any_to_pyobject,
 };
 use pyo3::{

nautilus_core/adapters/src/databento/python/types.rs

@@ -21,7 +21,7 @@ use std::{
 use nautilus_core::python::serialization::from_dict_pyo3;
 use nautilus_model::{
     enums::OrderSide,
-    identifiers::instrument_id::InstrumentId,
+    identifiers::InstrumentId,
     types::{price::Price, quantity::Quantity},
 };
 use pyo3::{basic::CompareOp, prelude::*, types::PyDict};

nautilus_core/adapters/src/databento/types.rs

@@ -19,7 +19,7 @@ use databento::dbn;
 use nautilus_core::nanos::UnixNanos;
 use nautilus_model::{
     enums::OrderSide,
-    identifiers::instrument_id::InstrumentId,
+    identifiers::InstrumentId,
     types::{price::Price, quantity::Quantity},
 };
 use serde::Deserialize;

nautilus_core/backtest/src/matching_engine.rs

@@ -31,10 +31,7 @@ use nautilus_model::{
         delta::OrderBookDelta,
     },
     enums::{AccountType, BookType, MarketStatus, OmsType},
-    identifiers::{
-        account_id::AccountId, client_order_id::ClientOrderId, instrument_id::InstrumentId,
-        trader_id::TraderId, venue::Venue,
-    },
+    identifiers::{AccountId, ClientOrderId, InstrumentId, TraderId, Venue},
     instruments::Instrument,
     orderbook::book::OrderBook,
     orders::{

nautilus_core/common/src/cache/core.rs

@@ -30,10 +30,8 @@ use nautilus_model::{
     },
     enums::{AggregationSource, OmsType, OrderSide, PositionSide, PriceType, TriggerType},
     identifiers::{
-        account_id::AccountId, client_id::ClientId, client_order_id::ClientOrderId,
-        component_id::ComponentId, exec_algorithm_id::ExecAlgorithmId, instrument_id::InstrumentId,
-        order_list_id::OrderListId, position_id::PositionId, strategy_id::StrategyId, venue::Venue,
-        venue_order_id::VenueOrderId,
+        AccountId, ClientId, ClientOrderId, ComponentId, ExecAlgorithmId, InstrumentId,
+        OrderListId, PositionId, StrategyId, Venue, VenueOrderId,
     },
     instruments::{any::InstrumentAny, synthetic::SyntheticInstrument},
     orderbook::book::OrderBook,
@@ -2512,7 +2510,7 @@ mod tests {
         data::{bar::Bar, quote::QuoteTick, trade::TradeTick},
         enums::{OrderSide, OrderStatus},
         events::order::{OrderAccepted, OrderEventAny, OrderRejected, OrderSubmitted},
-        identifiers::{client_order_id::ClientOrderId, position_id::PositionId},
+        identifiers::{ClientOrderId, PositionId},
         instruments::{
             any::InstrumentAny, currency_pair::CurrencyPair, stubs::*,
             synthetic::SyntheticInstrument,

nautilus_core/common/src/cache/database.rs

@@ -24,9 +24,8 @@ use std::collections::HashMap;
 use nautilus_core::nanos::UnixNanos;
 use nautilus_model::{
     identifiers::{
-        account_id::AccountId, client_id::ClientId, client_order_id::ClientOrderId,
-        component_id::ComponentId, instrument_id::InstrumentId, position_id::PositionId,
-        strategy_id::StrategyId, venue_order_id::VenueOrderId,
+        AccountId, ClientId, ClientOrderId, ComponentId, InstrumentId, PositionId, StrategyId,
+        VenueOrderId,
     },
     instruments::{any::InstrumentAny, synthetic::SyntheticInstrument},
     orders::any::OrderAny,

nautilus_core/common/src/factories.rs

@@ -21,9 +21,7 @@ use nautilus_core::{time::AtomicTime, uuid::UUID4};
 use nautilus_model::{
     enums::{ContingencyType, OrderSide, TimeInForce},
     identifiers::{
-        client_order_id::ClientOrderId, exec_algorithm_id::ExecAlgorithmId,
-        instrument_id::InstrumentId, order_list_id::OrderListId, strategy_id::StrategyId,
-        trader_id::TraderId,
+        ClientOrderId, ExecAlgorithmId, InstrumentId, OrderListId, StrategyId, TraderId,
     },
     orders::{any::OrderAny, market::MarketOrder},
     types::quantity::Quantity,
@@ -146,9 +144,7 @@ impl OrderFactory {
 pub mod tests {
     use nautilus_model::{
         enums::{OrderSide, TimeInForce},
-        identifiers::{
-            client_order_id::ClientOrderId, instrument_id::InstrumentId, order_list_id::OrderListId,
-        },
+        identifiers::{ClientOrderId, InstrumentId, OrderListId},
     };
     use rstest::rstest;
 

nautilus_core/common/src/interface/account.rs

@@ -18,7 +18,7 @@ use std::collections::HashMap;
 use nautilus_model::{
     enums::{AccountType, LiquiditySide, OrderSide},
     events::{account::state::AccountState, order::filled::OrderFilled},
-    identifiers::account_id::AccountId,
+    identifiers::AccountId,
     instruments::any::InstrumentAny,
     position::Position,
     types::{

nautilus_core/common/src/xrate.rs

@@ -25,7 +25,7 @@ use std::collections::{HashMap, HashSet};
 
 use itertools::Itertools;
 use nautilus_core::correctness::{check_equal_usize, check_map_not_empty};
-use nautilus_model::{enums::PriceType, identifiers::symbol::Symbol, types::currency::Currency};
+use nautilus_model::{enums::PriceType, identifiers::Symbol, types::currency::Currency};
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use ustr::Ustr;

nautilus_core/execution/src/client.rs

@@ -25,9 +25,8 @@ use nautilus_model::{
     enums::{AccountType, LiquiditySide, OmsType, OrderSide, OrderType},
     events::{account::state::AccountState, order::OrderEventAny},
     identifiers::{
-        account_id::AccountId, client_order_id::ClientOrderId, instrument_id::InstrumentId,
-        position_id::PositionId, strategy_id::StrategyId, trade_id::TradeId, venue::Venue,
-        venue_order_id::VenueOrderId,
+        AccountId, ClientOrderId, InstrumentId, PositionId, StrategyId, TradeId, Venue,
+        VenueOrderId,
     },
     types::{
         balance::{AccountBalance, MarginBalance},

nautilus_core/execution/src/engine.rs

@@ -26,9 +26,7 @@ use nautilus_common::{cache::Cache, generators::position_id::PositionIdGenerator
 use nautilus_model::{
     enums::{OmsType, OrderSide},
     events::order::{filled::OrderFilled, OrderEventAny},
-    identifiers::{
-        client_id::ClientId, instrument_id::InstrumentId, strategy_id::StrategyId, venue::Venue,
-    },
+    identifiers::{ClientId, InstrumentId, StrategyId, Venue},
     instruments::any::InstrumentAny,
     orders::any::OrderAny,
     position::Position,

nautilus_core/execution/src/matching_core.rs

@@ -21,7 +21,7 @@
 
 use nautilus_model::{
     enums::OrderSideSpecified,
-    identifiers::{client_order_id::ClientOrderId, instrument_id::InstrumentId},
+    identifiers::{ClientOrderId, InstrumentId},
     orders::{
         any::{LimitOrderAny, PassiveOrderAny, StopOrderAny},
         base::OrderError,

nautilus_core/execution/src/messages/cancel_all.rs

@@ -19,10 +19,7 @@ use derive_builder::Builder;
 use nautilus_core::{nanos::UnixNanos, uuid::UUID4};
 use nautilus_model::{
     enums::OrderSide,
-    identifiers::{
-        client_id::ClientId, instrument_id::InstrumentId, strategy_id::StrategyId,
-        trader_id::TraderId,
-    },
+    identifiers::{ClientId, InstrumentId, StrategyId, TraderId},
 };
 use serde::{Deserialize, Serialize};
 

nautilus_core/execution/src/messages/modify.rs

@@ -18,10 +18,7 @@ use std::fmt::Display;
 use derive_builder::Builder;
 use nautilus_core::{nanos::UnixNanos, uuid::UUID4};
 use nautilus_model::{
-    identifiers::{
-        client_id::ClientId, client_order_id::ClientOrderId, instrument_id::InstrumentId,
-        strategy_id::StrategyId, trader_id::TraderId, venue_order_id::VenueOrderId,
-    },
+    identifiers::{ClientId, ClientOrderId, InstrumentId, StrategyId, TraderId, VenueOrderId},
     types::{price::Price, quantity::Quantity},
 };
 use serde::{Deserialize, Serialize};

nautilus_core/execution/src/messages/submit_list.rs

@@ -18,9 +18,8 @@ use std::fmt::Display;
 use nautilus_core::{nanos::UnixNanos, uuid::UUID4};
 use nautilus_model::{
     identifiers::{
-        client_id::ClientId, client_order_id::ClientOrderId, exec_algorithm_id::ExecAlgorithmId,
-        instrument_id::InstrumentId, position_id::PositionId, strategy_id::StrategyId,
-        trader_id::TraderId, venue_order_id::VenueOrderId,
+        ClientId, ClientOrderId, ExecAlgorithmId, InstrumentId, PositionId, StrategyId, TraderId,
+        VenueOrderId,
     },
     orders::list::OrderList,
 };

nautilus_core/indicators/src/book/imbalance.rs

@@ -99,7 +99,7 @@ impl BookImbalanceRatio {
 #[cfg(test)]
 mod tests {
     use nautilus_model::{
-        identifiers::instrument_id::InstrumentId,
+        identifiers::InstrumentId,
         stubs::{stub_order_book_mbp, stub_order_book_mbp_appl_xnas},
     };
     use rstest::rstest;

nautilus_core/indicators/src/stubs.rs

@@ -22,7 +22,7 @@ use nautilus_model::{
         trade::TradeTick,
     },
     enums::{AggregationSource, AggressorSide, BarAggregation, PriceType},
-    identifiers::{instrument_id::InstrumentId, symbol::Symbol, trade_id::TradeId, venue::Venue},
+    identifiers::{InstrumentId, Symbol, TradeId, Venue},
     types::{price::Price, quantity::Quantity},
 };
 use rstest::*;

nautilus_core/infrastructure/src/python/sql/cache_database.rs

@@ -18,7 +18,7 @@ use std::collections::HashMap;
 use nautilus_common::runtime::get_runtime;
 use nautilus_core::python::to_pyruntime_err;
 use nautilus_model::{
-    identifiers::{client_order_id::ClientOrderId, instrument_id::InstrumentId},
+    identifiers::{ClientOrderId, InstrumentId},
     python::{
         instruments::{instrument_any_to_pyobject, pyobject_to_instrument_any},
         orders::{convert_order_any_to_pyobject, convert_pyobject_to_order_any},

nautilus_core/infrastructure/src/redis/cache.rs

@@ -27,9 +27,8 @@ use nautilus_common::{
 use nautilus_core::{correctness::check_slice_not_empty, nanos::UnixNanos, uuid::UUID4};
 use nautilus_model::{
     identifiers::{
-        account_id::AccountId, client_id::ClientId, client_order_id::ClientOrderId,
-        component_id::ComponentId, instrument_id::InstrumentId, position_id::PositionId,
-        strategy_id::StrategyId, trader_id::TraderId, venue_order_id::VenueOrderId,
+        AccountId, ClientId, ClientOrderId, ComponentId, InstrumentId, PositionId, StrategyId,
+        TraderId, VenueOrderId,
     },
     instruments::{any::InstrumentAny, synthetic::SyntheticInstrument},
     orders::any::OrderAny,

nautilus_core/infrastructure/src/sql/cache_database.rs

@@ -19,7 +19,7 @@ use std::{
 };
 
 use nautilus_model::{
-    identifiers::{client_order_id::ClientOrderId, instrument_id::InstrumentId},
+    identifiers::{ClientOrderId, InstrumentId},
     instruments::any::InstrumentAny,
     orders::any::OrderAny,
     types::currency::Currency,

nautilus_core/infrastructure/src/sql/models/instruments.rs

@@ -22,7 +22,7 @@ use std::str::FromStr;
 use nautilus_core::nanos::UnixNanos;
 use nautilus_model::{
     enums::{AssetClass, OptionKind},
-    identifiers::{instrument_id::InstrumentId, symbol::Symbol},
+    identifiers::{InstrumentId, Symbol},
     instruments::{
         any::InstrumentAny, crypto_future::CryptoFuture, crypto_perpetual::CryptoPerpetual,
         currency_pair::CurrencyPair, equity::Equity, futures_contract::FuturesContract,

nautilus_core/infrastructure/src/sql/models/orders.rs

@@ -28,10 +28,8 @@ use nautilus_model::{
         OrderTriggered, OrderUpdated,
     },
     identifiers::{
-        account_id::AccountId, client_order_id::ClientOrderId, exec_algorithm_id::ExecAlgorithmId,
-        instrument_id::InstrumentId, order_list_id::OrderListId, position_id::PositionId,
-        strategy_id::StrategyId, trade_id::TradeId, trader_id::TraderId,
-        venue_order_id::VenueOrderId,
+        AccountId, ClientOrderId, ExecAlgorithmId, InstrumentId, OrderListId, PositionId,
+        StrategyId, TradeId, TraderId, VenueOrderId,
     },
     types::{currency::Currency, money::Money, price::Price, quantity::Quantity},
 };

nautilus_core/infrastructure/src/sql/queries.rs

@@ -17,7 +17,7 @@ use std::collections::HashMap;
 
 use nautilus_model::{
     events::order::{OrderEvent, OrderEventAny},
-    identifiers::{client_order_id::ClientOrderId, instrument_id::InstrumentId},
+    identifiers::{ClientOrderId, InstrumentId},
     instruments::{any::InstrumentAny, Instrument},
     orders::{any::OrderAny, base::Order},
     types::currency::Currency,

nautilus_core/infrastructure/tests/test_cache_database_postgres.rs

@@ -65,8 +65,7 @@ mod tests {
     use nautilus_model::{
         enums::{CurrencyType, OrderSide},
         identifiers::{
-            account_id::AccountId, client_order_id::ClientOrderId, instrument_id::InstrumentId,
-            stubs::account_id, trade_id::TradeId, venue_order_id::VenueOrderId,
+            enueOrderId, stubs::account_id, AccountId, ClientOrderId, InstrumentId, TradeId,
         },
         instruments::{
             any::InstrumentAny,