From 92364c6d6a377134fe00f92a3af6cad5fd5d71d8 Mon Sep 17 00:00:00 2001 From: Philipp Hoenisch Date: Tue, 26 Mar 2024 14:04:32 +1000 Subject: [PATCH] chore: rename new order types this will allow us to differentiate between newOrders and Orders --- coordinator/src/node/expired_positions.rs | 4 ++-- coordinator/src/orderbook/db/orders.rs | 16 ++++++++-------- coordinator/src/orderbook/tests/sample_test.rs | 12 ++++++------ crates/commons/src/order.rs | 18 +++++++++--------- crates/dev-maker/src/main.rs | 4 ++-- mobile/native/src/trade/order/mod.rs | 4 ++-- .../native/src/trade/order/orderbook_client.rs | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/coordinator/src/node/expired_positions.rs b/coordinator/src/node/expired_positions.rs index f61a7284a..82ef5aa58 100644 --- a/coordinator/src/node/expired_positions.rs +++ b/coordinator/src/node/expired_positions.rs @@ -9,9 +9,9 @@ use anyhow::anyhow; use anyhow::Context; use anyhow::Result; use commons::average_execution_price; -use commons::MarketOrder; use commons::Match; use commons::MatchState; +use commons::NewMarketOrder; use commons::OrderReason; use commons::OrderState; use rust_decimal::prelude::FromPrimitive; @@ -79,7 +79,7 @@ pub async fn close(node: Node, trading_sender: mpsc::Sender) -> tracing::debug!(trader_pk=%position.trader, %position.expiry_timestamp, "Attempting to close expired position"); - let new_order = MarketOrder { + let new_order = NewMarketOrder { id: uuid::Uuid::new_v4(), contract_symbol: position.contract_symbol, quantity: Decimal::try_from(position.quantity).expect("to fit into decimal"), diff --git a/coordinator/src/orderbook/db/orders.rs b/coordinator/src/orderbook/db/orders.rs index d1352e939..8223bfd46 100644 --- a/coordinator/src/orderbook/db/orders.rs +++ b/coordinator/src/orderbook/db/orders.rs @@ -7,8 +7,8 @@ use crate::orderbook::db::custom_types::OrderType; use crate::schema::matches; use crate::schema::orders; use bitcoin::secp256k1::PublicKey; -use commons::LimitOrder; -use commons::MarketOrder; +use commons::NewLimitOrder; +use commons::NewMarketOrder; use commons::Order as OrderbookOrder; use commons::OrderReason as OrderBookOrderReason; use commons::OrderState as OrderBookOrderState; @@ -160,8 +160,8 @@ struct NewOrder { pub stable: bool, } -impl From for NewOrder { - fn from(value: LimitOrder) -> Self { +impl From for NewOrder { + fn from(value: NewLimitOrder) -> Self { NewOrder { trader_order_id: value.id, price: value @@ -189,8 +189,8 @@ impl From for NewOrder { } } -impl From for NewOrder { - fn from(value: MarketOrder) -> Self { +impl From for NewOrder { + fn from(value: NewMarketOrder) -> Self { NewOrder { trader_order_id: value.id, // TODO: it would be cool to get rid of this as well @@ -271,7 +271,7 @@ pub fn get_all_orders( /// Returns the number of affected rows: 1. pub fn insert_limit_order( conn: &mut PgConnection, - order: LimitOrder, + order: NewLimitOrder, order_reason: OrderBookOrderReason, ) -> QueryResult { let new_order = NewOrder { @@ -288,7 +288,7 @@ pub fn insert_limit_order( /// Returns the number of affected rows: 1. pub fn insert_market_order( conn: &mut PgConnection, - order: MarketOrder, + order: NewMarketOrder, order_reason: OrderBookOrderReason, ) -> QueryResult { let new_order = NewOrder { diff --git a/coordinator/src/orderbook/tests/sample_test.rs b/coordinator/src/orderbook/tests/sample_test.rs index b9ec0b6d3..575141673 100644 --- a/coordinator/src/orderbook/tests/sample_test.rs +++ b/coordinator/src/orderbook/tests/sample_test.rs @@ -3,8 +3,8 @@ use crate::orderbook::db::orders; use crate::orderbook::tests::setup_db; use crate::orderbook::tests::start_postgres; use bitcoin::secp256k1::PublicKey; -use commons::LimitOrder; -use commons::MarketOrder; +use commons::NewLimitOrder; +use commons::NewMarketOrder; use commons::OrderReason; use commons::OrderState; use rust_decimal_macros::dec; @@ -62,8 +62,8 @@ async fn test_all_limit_orders() { assert_eq!(orders.len(), 1); } -fn dummy_market_order(expiry: OffsetDateTime) -> MarketOrder { - MarketOrder { +fn dummy_market_order(expiry: OffsetDateTime) -> NewMarketOrder { + NewMarketOrder { id: Uuid::new_v4(), trader_id: PublicKey::from_str( "027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007", @@ -78,8 +78,8 @@ fn dummy_market_order(expiry: OffsetDateTime) -> MarketOrder { } } -fn dummy_limit_order(expiry: OffsetDateTime) -> LimitOrder { - LimitOrder { +fn dummy_limit_order(expiry: OffsetDateTime) -> NewLimitOrder { + NewLimitOrder { id: Uuid::new_v4(), price: dec!(20000.00), trader_id: PublicKey::from_str( diff --git a/crates/commons/src/order.rs b/crates/commons/src/order.rs index 970dff4b9..68d372279 100644 --- a/crates/commons/src/order.rs +++ b/crates/commons/src/order.rs @@ -33,8 +33,8 @@ impl NewOrderRequest { #[derive(Serialize, Deserialize, Clone)] pub enum NewOrder { - Market(MarketOrder), - Limit(LimitOrder), + Market(NewMarketOrder), + Limit(NewLimitOrder), } impl NewOrder { @@ -83,7 +83,7 @@ impl NewOrder { } #[derive(Serialize, Deserialize, Clone)] -pub struct MarketOrder { +pub struct NewMarketOrder { pub id: Uuid, pub contract_symbol: ContractSymbol, #[serde(with = "rust_decimal::serde::float")] @@ -98,7 +98,7 @@ pub struct MarketOrder { } #[derive(Serialize, Deserialize, Clone)] -pub struct LimitOrder { +pub struct NewLimitOrder { pub id: Uuid, pub contract_symbol: ContractSymbol, #[serde(with = "rust_decimal::serde::float")] @@ -114,7 +114,7 @@ pub struct LimitOrder { pub stable: bool, } -impl LimitOrder { +impl NewLimitOrder { pub fn message(&self) -> Message { let mut vec: Vec = vec![]; let mut id = self.id.as_bytes().to_vec(); @@ -144,7 +144,7 @@ impl LimitOrder { } } -impl MarketOrder { +impl NewMarketOrder { pub fn message(&self) -> Message { let mut vec: Vec = vec![]; let mut id = self.id.as_bytes().to_vec(); @@ -239,7 +239,7 @@ pub struct ChannelOpeningParams { #[cfg(test)] pub mod tests { - use crate::LimitOrder; + use crate::NewLimitOrder; use crate::NewOrder; use crate::NewOrderRequest; use secp256k1::rand; @@ -258,7 +258,7 @@ pub mod tests { let secret_key = SecretKey::new(&mut rand::thread_rng()); let public_key = secret_key.public_key(SECP256K1); - let order = LimitOrder { + let order = NewLimitOrder { id: Default::default(), contract_symbol: ContractSymbol::BtcUsd, price: rust_decimal_macros::dec!(53_000), @@ -284,7 +284,7 @@ pub mod tests { .unwrap(); let public_key = secret_key.public_key(SECP256K1); - let original_order = LimitOrder { + let original_order = NewLimitOrder { id: Uuid::from_str("67e5504410b1426f9247bb680e5fe0c8").unwrap(), contract_symbol: ContractSymbol::BtcUsd, price: rust_decimal_macros::dec!(53_000), diff --git a/crates/dev-maker/src/main.rs b/crates/dev-maker/src/main.rs index 16bd89400..a4ed40a95 100644 --- a/crates/dev-maker/src/main.rs +++ b/crates/dev-maker/src/main.rs @@ -1,7 +1,7 @@ use crate::logger::init_tracing; use crate::orderbook_client::OrderbookClient; use anyhow::Result; -use commons::LimitOrder; +use commons::NewLimitOrder; use commons::NewOrder; use reqwest::Url; use rust_decimal::Decimal; @@ -99,7 +99,7 @@ async fn post_order( let uuid = Uuid::new_v4(); if let Err(err) = client .post_new_order( - NewOrder::Limit(LimitOrder { + NewOrder::Limit(NewLimitOrder { id: uuid, contract_symbol: ContractSymbol::BtcUsd, price, diff --git a/mobile/native/src/trade/order/mod.rs b/mobile/native/src/trade/order/mod.rs index 8b32a71c6..c8c27bb96 100644 --- a/mobile/native/src/trade/order/mod.rs +++ b/mobile/native/src/trade/order/mod.rs @@ -193,11 +193,11 @@ impl Order { } } -impl From for commons::MarketOrder { +impl From for commons::NewMarketOrder { fn from(order: Order) -> Self { let quantity = Decimal::try_from(order.quantity).expect("to parse into decimal"); let trader_id = ln_dlc::get_node_pubkey(); - commons::MarketOrder { + commons::NewMarketOrder { id: order.id, contract_symbol: order.contract_symbol, quantity, diff --git a/mobile/native/src/trade/order/orderbook_client.rs b/mobile/native/src/trade/order/orderbook_client.rs index 8001dae9f..47463dd44 100644 --- a/mobile/native/src/trade/order/orderbook_client.rs +++ b/mobile/native/src/trade/order/orderbook_client.rs @@ -3,7 +3,7 @@ use crate::ln_dlc::get_node_key; use anyhow::bail; use anyhow::Result; use commons::ChannelOpeningParams; -use commons::MarketOrder; +use commons::NewMarketOrder; use commons::NewOrder; use commons::NewOrderRequest; use reqwest::Url; @@ -19,7 +19,7 @@ impl OrderbookClient { pub(crate) async fn post_new_market_order( &self, - order: MarketOrder, + order: NewMarketOrder, channel_opening_params: Option, ) -> Result<()> { let secret_key = get_node_key();