Refine identifier imports in Rust

Author: cjdsellers

nautilus_core/adapters/src/databento/symbology.rs

@@ -17,7 +17,7 @@ use databento::dbn;
 use dbn::Record;
 use indexmap::IndexMap;
 use nautilus_core::correctness::check_slice_not_empty;
-use nautilus_model::identifiers::{instrument_id::InstrumentId, symbol::Symbol, venue::Venue};
+use nautilus_model::identifiers::{InstrumentId, Symbol, Venue};
 
 use super::types::PublisherId;
 

nautilus_core/common/src/ffi/logging.rs

@@ -25,7 +25,7 @@ use nautilus_core::{
     },
     uuid::UUID4,
 };
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 
 use crate::{
     enums::{LogColor, LogLevel},

nautilus_core/common/src/generators/client_order_id.rs

@@ -14,9 +14,7 @@
 // -------------------------------------------------------------------------------------------------
 
 use nautilus_core::time::AtomicTime;
-use nautilus_model::identifiers::{
-    client_order_id::ClientOrderId, strategy_id::StrategyId, trader_id::TraderId,
-};
+use nautilus_model::identifiers::{ClientOrderId, StrategyId, TraderId};
 
 use super::get_datetime_tag;
 
@@ -77,9 +75,7 @@ impl ClientOrderIdGenerator {
 #[cfg(test)]
 mod tests {
     use nautilus_core::time::get_atomic_clock_static;
-    use nautilus_model::identifiers::{
-        client_order_id::ClientOrderId, strategy_id::StrategyId, trader_id::TraderId,
-    };
+    use nautilus_model::identifiers::{ClientOrderId, StrategyId, TraderId};
     use rstest::rstest;
 
     use crate::generators::client_order_id::ClientOrderIdGenerator;

nautilus_core/common/src/generators/order_list_id.rs

@@ -14,9 +14,7 @@
 // -------------------------------------------------------------------------------------------------
 
 use nautilus_core::time::AtomicTime;
-use nautilus_model::identifiers::{
-    order_list_id::OrderListId, strategy_id::StrategyId, trader_id::TraderId,
-};
+use nautilus_model::identifiers::{OrderListId, StrategyId, TraderId};
 
 use super::get_datetime_tag;
 
@@ -77,9 +75,7 @@ impl OrderListIdGenerator {
 #[cfg(test)]
 mod tests {
     use nautilus_core::time::get_atomic_clock_static;
-    use nautilus_model::identifiers::{
-        order_list_id::OrderListId, strategy_id::StrategyId, trader_id::TraderId,
-    };
+    use nautilus_model::identifiers::{OrderListId, StrategyId, TraderId};
     use rstest::rstest;
 
     use crate::generators::order_list_id::OrderListIdGenerator;

nautilus_core/common/src/generators/position_id.rs

@@ -16,9 +16,7 @@
 use std::collections::HashMap;
 
 use nautilus_core::time::AtomicTime;
-use nautilus_model::identifiers::{
-    position_id::PositionId, strategy_id::StrategyId, trader_id::TraderId,
-};
+use nautilus_model::identifiers::{PositionId, StrategyId, TraderId};
 
 use super::get_datetime_tag;
 
@@ -72,9 +70,7 @@ impl PositionIdGenerator {
 #[cfg(test)]
 mod tests {
     use nautilus_core::time::get_atomic_clock_static;
-    use nautilus_model::identifiers::{
-        position_id::PositionId, strategy_id::StrategyId, trader_id::TraderId,
-    };
+    use nautilus_model::identifiers::{PositionId, StrategyId, TraderId};
     use rstest::rstest;
 
     use crate::generators::position_id::PositionIdGenerator;

nautilus_core/common/src/logging/headers.rs

@@ -14,7 +14,7 @@
 // -------------------------------------------------------------------------------------------------
 
 use nautilus_core::uuid::UUID4;
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use sysinfo::System;
 use ustr::Ustr;
 

nautilus_core/common/src/logging/logger.rs

@@ -35,7 +35,7 @@ use nautilus_core::{
     time::{get_atomic_clock_realtime, get_atomic_clock_static},
     uuid::UUID4,
 };
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use serde::{Deserialize, Serialize, Serializer};
 use ustr::Ustr;
 
@@ -514,7 +514,7 @@ mod tests {
 
     use log::{info, LevelFilter};
     use nautilus_core::uuid::UUID4;
-    use nautilus_model::identifiers::trader_id::TraderId;
+    use nautilus_model::identifiers::TraderId;
     use rstest::*;
     use serde_json::Value;
     use tempfile::tempdir;

nautilus_core/common/src/logging/mod.rs

@@ -24,7 +24,7 @@ use std::{
 
 use log::LevelFilter;
 use nautilus_core::{time::get_atomic_clock_static, uuid::UUID4};
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use tracing::error;
 use tracing_subscriber::EnvFilter;
 use ustr::Ustr;

nautilus_core/common/src/msgbus/core.rs

@@ -22,7 +22,7 @@ use std::{
 use indexmap::IndexMap;
 use log::error;
 use nautilus_core::uuid::UUID4;
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use serde::{Deserialize, Serialize};
 use ustr::Ustr;
 

nautilus_core/common/src/msgbus/database.rs

@@ -16,7 +16,7 @@
 use std::collections::HashMap;
 
 use nautilus_core::uuid::UUID4;
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 
 /// A generic message bus database facade.
 ///

nautilus_core/common/src/python/logging.rs

@@ -17,7 +17,7 @@ use std::collections::HashMap;
 
 use log::LevelFilter;
 use nautilus_core::uuid::UUID4;
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use pyo3::prelude::*;
 use ustr::Ustr;
 

nautilus_core/execution/src/messages/cancel.rs

@@ -18,8 +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,
+    ClientId, ClientOrderId, InstrumentId, StrategyId, TraderId, VenueOrderId,
 };
 use serde::{Deserialize, Serialize};
 

nautilus_core/execution/src/messages/cancel_batch.rs

@@ -17,9 +17,7 @@ use std::fmt::Display;
 
 use derive_builder::Builder;
 use nautilus_core::{nanos::UnixNanos, uuid::UUID4};
-use nautilus_model::identifiers::{
-    client_id::ClientId, instrument_id::InstrumentId, strategy_id::StrategyId, trader_id::TraderId,
-};
+use nautilus_model::identifiers::{ClientId, InstrumentId, StrategyId, TraderId};
 use serde::{Deserialize, Serialize};
 
 use super::cancel::CancelOrder;

nautilus_core/execution/src/messages/mod.rs

@@ -15,7 +15,7 @@
 
 //! Execution specific messages such as order commands.
 
-use nautilus_model::identifiers::{client_id::ClientId, instrument_id::InstrumentId};
+use nautilus_model::identifiers::{ClientId, InstrumentId};
 use strum::Display;
 
 use self::{

nautilus_core/execution/src/messages/query.rs

@@ -18,8 +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,
+    ClientId, ClientOrderId, InstrumentId, StrategyId, TraderId, VenueOrderId,
 };
 use serde::{Deserialize, Serialize};
 

nautilus_core/execution/src/messages/submit.rs

@@ -18,9 +18,8 @@ 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, 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,
 };
 use serde::{Deserialize, Serialize};
 

nautilus_core/infrastructure/src/python/redis/cache.rs

@@ -19,7 +19,7 @@ use nautilus_core::{
     python::{to_pyruntime_err, to_pyvalue_err},
     uuid::UUID4,
 };
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use pyo3::{prelude::*, types::PyBytes};
 
 use crate::redis::cache::RedisCacheDatabase;

nautilus_core/infrastructure/src/python/redis/msgbus.rs

@@ -20,7 +20,7 @@ use nautilus_core::{
     python::{to_pyruntime_err, to_pyvalue_err},
     uuid::UUID4,
 };
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use pyo3::prelude::*;
 
 use crate::redis::msgbus::RedisMessageBusDatabase;

nautilus_core/infrastructure/src/redis/mod.rs

@@ -21,7 +21,7 @@ pub mod msgbus;
 use std::{collections::HashMap, time::Duration};
 
 use nautilus_core::uuid::UUID4;
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use redis::*;
 use semver::Version;
 use serde_json::{json, Value};

nautilus_core/infrastructure/src/redis/msgbus.rs

@@ -22,7 +22,7 @@ use std::{
 
 use nautilus_common::msgbus::{core::CLOSE_TOPIC, database::MessageBusDatabaseAdapter, BusMessage};
 use nautilus_core::{time::duration_since_unix_epoch, uuid::UUID4};
-use nautilus_model::identifiers::trader_id::TraderId;
+use nautilus_model::identifiers::TraderId;
 use redis::*;
 use serde_json::Value;
 use tracing::{debug, error};

nautilus_core/model/src/events/order/mod.rs

@@ -51,6 +51,7 @@ pub mod updated;
 #[cfg(feature = "stubs")]
 pub mod stubs;
 
+// Re-exports
 pub use crate::events::order::{
     accepted::OrderAccepted, any::OrderEventAny, cancel_rejected::OrderCancelRejected,
     canceled::OrderCanceled, denied::OrderDenied, emulated::OrderEmulated, expired::OrderExpired,

nautilus_core/model/src/identifiers/mod.rs

@@ -40,6 +40,14 @@ pub mod venue_order_id;
 #[cfg(feature = "stubs")]
 pub mod stubs;
 
+// Re-exports
+pub use crate::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, symbol::Symbol,
+    trade_id::TradeId, trader_id::TraderId, venue::Venue, venue_order_id::VenueOrderId,
+};
+
 impl_from_str_for_identifier!(account_id::AccountId);
 impl_from_str_for_identifier!(client_id::ClientId);
 impl_from_str_for_identifier!(client_order_id::ClientOrderId);