From f8ba9751dd8d3ebf19f88bf93615cb410181729b Mon Sep 17 00:00:00 2001 From: laruh Date: Mon, 16 Dec 2024 21:14:12 +0700 Subject: [PATCH] revert "swap_version" field --- mm2src/mm2_main/src/lp_ordermatch.rs | 68 ++----------------- .../src/lp_ordermatch/my_orders_storage.rs | 2 - .../src/lp_ordermatch/new_protocol.rs | 8 +-- mm2src/mm2_main/src/ordermatch_tests.rs | 54 --------------- 4 files changed, 7 insertions(+), 125 deletions(-) diff --git a/mm2src/mm2_main/src/lp_ordermatch.rs b/mm2src/mm2_main/src/lp_ordermatch.rs index 1dbc3689f9..4874e3abc2 100644 --- a/mm2src/mm2_main/src/lp_ordermatch.rs +++ b/mm2src/mm2_main/src/lp_ordermatch.rs @@ -134,8 +134,6 @@ const TRIE_STATE_HISTORY_TIMEOUT: u64 = 3; const TRIE_ORDER_HISTORY_TIMEOUT: u64 = 300; #[cfg(test)] const TRIE_ORDER_HISTORY_TIMEOUT: u64 = 3; -/// Swap protocol version -const SWAP_VERSION: u32 = 2; pub type OrderbookP2PHandlerResult = Result<(), MmError>; @@ -1172,9 +1170,6 @@ pub struct TakerRequest { #[serde(default)] #[serde(skip_serializing_if = "Option::is_none")] pub rel_protocol_info: Option>, - #[serde(default = "legacy_swap_version")] - #[serde(skip_serializing_if = "is_legacy_swap_version")] - pub swap_version: u32, } impl TakerRequest { @@ -1195,7 +1190,6 @@ impl TakerRequest { conf_settings: Some(message.conf_settings), base_protocol_info: message.base_protocol_info, rel_protocol_info: message.rel_protocol_info, - swap_version: message.swap_version, } } @@ -1241,7 +1235,6 @@ impl From for new_protocol::OrdermatchMessage { conf_settings: taker_order.request.conf_settings.unwrap(), base_protocol_info: taker_order.request.base_protocol_info, rel_protocol_info: taker_order.request.rel_protocol_info, - swap_version: taker_order.request.swap_version, }) } } @@ -1252,10 +1245,6 @@ impl TakerRequest { fn get_rel_amount(&self) -> &MmNumber { &self.rel_amount } } -fn legacy_swap_version() -> u32 { 1 } - -fn is_legacy_swap_version(swap_version: &u32) -> bool { *swap_version == 1 } - pub struct TakerOrderBuilder<'a> { base_coin: &'a MmCoinEnum, rel_coin: &'a MmCoinEnum, @@ -1271,7 +1260,6 @@ pub struct TakerOrderBuilder<'a> { min_volume: Option, timeout: u64, save_in_history: bool, - swap_version: u32, } pub enum TakerOrderBuildError { @@ -1351,7 +1339,6 @@ impl<'a> TakerOrderBuilder<'a> { order_type: OrderType::GoodTillCancelled, timeout: TAKER_ORDER_TIMEOUT, save_in_history: true, - swap_version: SWAP_VERSION, } } @@ -1415,17 +1402,6 @@ impl<'a> TakerOrderBuilder<'a> { self } - /// When a new [TakerOrderBuilder::new] is created, it sets [SWAP_VERSION] by default. - /// However, if user has not specified in the config to use TPU V2, - /// the TakerOrderBuilder's swap_version is changed to legacy. - /// In the future alls users will be using TPU V2 by default without "use_trading_proto_v2" configuration. - pub fn use_trading_proto_v2(mut self, use_trading_proto_v2: bool) -> Self { - if !use_trading_proto_v2 { - self.swap_version = 1; - } - self - } - /// Validate fields and build #[allow(clippy::result_large_err)] pub fn build(self) -> Result { @@ -1514,7 +1490,6 @@ impl<'a> TakerOrderBuilder<'a> { conf_settings: self.conf_settings, base_protocol_info: Some(base_protocol_info), rel_protocol_info: Some(rel_protocol_info), - swap_version: self.swap_version, }, matches: Default::default(), min_volume, @@ -1555,7 +1530,6 @@ impl<'a> TakerOrderBuilder<'a> { conf_settings: self.conf_settings, base_protocol_info: Some(base_protocol_info), rel_protocol_info: Some(rel_protocol_info), - swap_version: self.swap_version, }, matches: HashMap::new(), min_volume: Default::default(), @@ -1717,9 +1691,6 @@ pub struct MakerOrder { /// A custom priv key for more privacy to prevent linking orders of the same node between each other /// Commonly used with privacy coins (ARRR, ZCash, etc.) p2p_privkey: Option, - #[serde(default = "legacy_swap_version")] - #[serde(skip_serializing_if = "is_legacy_swap_version")] - pub swap_version: u32, } pub struct MakerOrderBuilder<'a> { @@ -1732,7 +1703,6 @@ pub struct MakerOrderBuilder<'a> { rel_orderbook_ticker: Option, conf_settings: Option, save_in_history: bool, - swap_version: u32, } pub enum MakerOrderBuildError { @@ -1882,7 +1852,6 @@ impl<'a> MakerOrderBuilder<'a> { price: 0.into(), conf_settings: None, save_in_history: true, - swap_version: SWAP_VERSION, } } @@ -1921,17 +1890,6 @@ impl<'a> MakerOrderBuilder<'a> { self } - /// When a new [MakerOrderBuilder::new] is created, it sets [SWAP_VERSION] by default. - /// However, if user has not specified in the config to use TPU V2, - /// the MakerOrderBuilder's swap_version is changed to legacy. - /// In the future alls users will be using TPU V2 by default without "use_trading_proto_v2" configuration. - pub fn use_trading_proto_v2(mut self, use_trading_proto_v2: bool) -> Self { - if !use_trading_proto_v2 { - self.swap_version = 1; - } - self - } - /// Build MakerOrder #[allow(clippy::result_large_err)] pub fn build(self) -> Result { @@ -1988,7 +1946,6 @@ impl<'a> MakerOrderBuilder<'a> { base_orderbook_ticker: self.base_orderbook_ticker, rel_orderbook_ticker: self.rel_orderbook_ticker, p2p_privkey, - swap_version: self.swap_version, }) } @@ -2013,7 +1970,6 @@ impl<'a> MakerOrderBuilder<'a> { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: self.swap_version, } } } @@ -2144,7 +2100,6 @@ impl From for MakerOrder { base_orderbook_ticker: taker_order.base_orderbook_ticker, rel_orderbook_ticker: taker_order.rel_orderbook_ticker, p2p_privkey: taker_order.p2p_privkey, - swap_version: taker_order.request.swap_version, }, // The "buy" taker order is recreated with reversed pair as Maker order is always considered as "sell" TakerAction::Buy => { @@ -2167,7 +2122,6 @@ impl From for MakerOrder { base_orderbook_ticker: taker_order.rel_orderbook_ticker, rel_orderbook_ticker: taker_order.base_orderbook_ticker, p2p_privkey: taker_order.p2p_privkey, - swap_version: taker_order.request.swap_version, } }, } @@ -2220,9 +2174,6 @@ pub struct MakerReserved { #[serde(default)] #[serde(skip_serializing_if = "Option::is_none")] pub rel_protocol_info: Option>, - #[serde(default = "legacy_swap_version")] - #[serde(skip_serializing_if = "is_legacy_swap_version")] - pub swap_version: u32, } impl MakerReserved { @@ -2250,7 +2201,6 @@ impl MakerReserved { conf_settings: Some(message.conf_settings), base_protocol_info: message.base_protocol_info, rel_protocol_info: message.rel_protocol_info, - swap_version: message.swap_version, } } } @@ -2267,7 +2217,6 @@ impl From for new_protocol::OrdermatchMessage { conf_settings: maker_reserved.conf_settings.unwrap(), base_protocol_info: maker_reserved.base_protocol_info, rel_protocol_info: maker_reserved.rel_protocol_info, - swap_version: maker_reserved.swap_version, }) } } @@ -3048,9 +2997,8 @@ fn lp_connect_start_bob(ctx: MmArc, maker_match: MakerMatch, maker_order: MakerO }, }; - let alice_swap_v = maker_match.request.swap_version; - // Start legacy swap if taker uses legacy protocol (version 1) or if conditions for trading_proto_v2 aren't met. - if alice_swap_v == 1u32 || !ctx.use_trading_proto_v2() { + // TODO add alice swap protocol version check once protocol versioning is implemented + if !ctx.use_trading_proto_v2() { let params = LegacySwapParams { maker_coin: &maker_coin, taker_coin: &taker_coin, @@ -3269,9 +3217,8 @@ fn lp_connected_alice(ctx: MmArc, taker_order: TakerOrder, taker_match: TakerMat uuid ); - let bob_swap_v = taker_match.reserved.swap_version; - // Start legacy swap if maker uses legacy protocol (version 1) or if conditions for trading_proto_v2 aren't met. - if bob_swap_v == 1u32 || !ctx.use_trading_proto_v2() { + // TODO add bob swap protocol version check once protocol versioning is implemented + if !ctx.use_trading_proto_v2() { let params = LegacySwapParams { maker_coin: &maker_coin, taker_coin: &taker_coin, @@ -3926,7 +3873,6 @@ async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request: }), base_protocol_info: Some(base_coin.coin_protocol_info(None)), rel_protocol_info: Some(rel_coin.coin_protocol_info(Some(rel_amount.clone()))), - swap_version: order.swap_version, }; let topic = order.orderbook_topic(); log::debug!("Request matched sending reserved {:?}", reserved); @@ -4159,8 +4105,7 @@ pub async fn lp_auto_buy( .with_sender_pubkey(H256Json::from(our_public_id.bytes)) .with_save_in_history(input.save_in_history) .with_base_orderbook_ticker(ordermatch_ctx.orderbook_ticker(base_coin.ticker())) - .with_rel_orderbook_ticker(ordermatch_ctx.orderbook_ticker(rel_coin.ticker())) - .use_trading_proto_v2(ctx.use_trading_proto_v2()); + .with_rel_orderbook_ticker(ordermatch_ctx.orderbook_ticker(rel_coin.ticker())); if let Some(timeout) = input.timeout { order_builder = order_builder.with_timeout(timeout); } @@ -4905,8 +4850,7 @@ pub async fn create_maker_order(ctx: &MmArc, req: SetPriceReq) -> Result>, - #[serde(default = "legacy_swap_version")] - #[serde(skip_serializing_if = "is_legacy_swap_version")] - pub swap_version: u32, } #[derive(Clone, Debug, Deserialize, Serialize)] @@ -285,9 +282,6 @@ pub struct MakerReserved { #[serde(default)] #[serde(skip_serializing_if = "Option::is_none")] pub rel_protocol_info: Option>, - #[serde(default = "legacy_swap_version")] - #[serde(skip_serializing_if = "is_legacy_swap_version")] - pub swap_version: u32, } #[derive(Clone, Debug, Deserialize, Serialize)] diff --git a/mm2src/mm2_main/src/ordermatch_tests.rs b/mm2src/mm2_main/src/ordermatch_tests.rs index 58d7ffa8f1..3bf81d6370 100644 --- a/mm2src/mm2_main/src/ordermatch_tests.rs +++ b/mm2src/mm2_main/src/ordermatch_tests.rs @@ -20,8 +20,6 @@ use std::collections::HashSet; use std::iter::{self, FromIterator}; use std::sync::Mutex; -const LEGACY_SWAP_V: u32 = 1; - #[test] fn test_match_maker_order_and_taker_request() { let maker = MakerOrder { @@ -41,7 +39,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { @@ -57,7 +54,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); @@ -81,7 +77,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { @@ -97,7 +92,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); @@ -121,7 +115,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { @@ -137,7 +130,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); @@ -161,7 +153,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { @@ -177,7 +168,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); @@ -201,7 +191,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { @@ -217,7 +206,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); @@ -241,7 +229,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { @@ -257,7 +244,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); @@ -283,7 +269,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { base: "KMD".to_owned(), @@ -298,7 +283,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); assert_eq!(actual, OrderMatchResult::NotMatched); @@ -325,7 +309,6 @@ fn test_match_maker_order_and_taker_request() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let request = TakerRequest { base: "REL".to_owned(), @@ -340,7 +323,6 @@ fn test_match_maker_order_and_taker_request() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let actual = maker.match_with_request(&request); let expected_base_amount = MmNumber::from(3); @@ -398,7 +380,6 @@ fn test_maker_order_available_amount() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; maker.matches.insert(new_uuid(), MakerMatch { request: TakerRequest { @@ -414,7 +395,6 @@ fn test_maker_order_available_amount() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }, reserved: MakerReserved { base: "BASE".into(), @@ -428,7 +408,6 @@ fn test_maker_order_available_amount() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }, connect: None, connected: None, @@ -448,7 +427,6 @@ fn test_maker_order_available_amount() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }, reserved: MakerReserved { base: "BASE".into(), @@ -462,7 +440,6 @@ fn test_maker_order_available_amount() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }, connect: None, connected: None, @@ -491,7 +468,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -519,7 +495,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved)); @@ -537,7 +512,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -565,7 +539,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved)); @@ -583,7 +556,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -611,7 +583,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved)); @@ -629,7 +600,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -657,7 +627,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::NotMatched, order.match_reserved(&reserved)); @@ -675,7 +644,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -703,7 +671,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved)); @@ -721,7 +688,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -749,7 +715,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved)); @@ -767,7 +732,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -795,7 +759,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved)); @@ -813,7 +776,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -841,7 +803,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::NotMatched, order.match_reserved(&reserved)); @@ -863,7 +824,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }, matches: HashMap::new(), order_type: OrderType::GoodTillCancelled, @@ -887,7 +847,6 @@ fn test_taker_match_reserved() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::Matched, order.match_reserved(&reserved)); @@ -908,7 +867,6 @@ fn test_taker_order_cancellable() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let order = TakerOrder { @@ -939,7 +897,6 @@ fn test_taker_order_cancellable() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let mut order = TakerOrder { @@ -969,7 +926,6 @@ fn test_taker_order_cancellable() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }, connect: TakerConnect { sender_pubkey: H256Json::default(), @@ -1018,7 +974,6 @@ fn prepare_for_cancel_by(ctx: &MmArc) -> mpsc::Receiver { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }, None, ); @@ -1041,7 +996,6 @@ fn prepare_for_cancel_by(ctx: &MmArc) -> mpsc::Receiver { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }, None, ); @@ -1064,7 +1018,6 @@ fn prepare_for_cancel_by(ctx: &MmArc) -> mpsc::Receiver { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }, None, ); @@ -1084,7 +1037,6 @@ fn prepare_for_cancel_by(ctx: &MmArc) -> mpsc::Receiver { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }, order_type: OrderType::GoodTillCancelled, min_volume: 0.into(), @@ -1187,7 +1139,6 @@ fn test_taker_order_match_by() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; let mut order = TakerOrder { @@ -1215,7 +1166,6 @@ fn test_taker_order_match_by() { conf_settings: None, base_protocol_info: None, rel_protocol_info: None, - swap_version: LEGACY_SWAP_V, }; assert_eq!(MatchReservedResult::NotMatched, order.match_reserved(&reserved)); @@ -1256,7 +1206,6 @@ fn test_maker_order_was_updated() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let mut update_msg = MakerOrderUpdated::new(maker_order.uuid); update_msg.with_new_price(BigRational::from_integer(2.into())); @@ -3263,7 +3212,6 @@ fn test_maker_order_balance_loops() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; let morty_order = MakerOrder { @@ -3283,7 +3231,6 @@ fn test_maker_order_balance_loops() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; assert!(!maker_orders_ctx.balance_loop_exists(rick_ticker)); @@ -3316,7 +3263,6 @@ fn test_maker_order_balance_loops() { base_orderbook_ticker: None, rel_orderbook_ticker: None, p2p_privkey: None, - swap_version: LEGACY_SWAP_V, }; maker_orders_ctx.add_order(ctx.weak(), rick_order_2.clone(), None);