From f3e723511561b800ff85e725894720639a3da793 Mon Sep 17 00:00:00 2001 From: avernikoz Date: Wed, 20 Aug 2025 22:05:10 +0300 Subject: [PATCH 1/5] add create_order_info_for_tests test func & make functions public (remove (package)) for bm and pool tests --- .../deepbook/sources/book/order_info.move | 42 +++++++++++++++++++ .../deepbook/tests/balance_manager_tests.move | 10 ++--- packages/deepbook/tests/pool_tests.move | 18 ++++---- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/packages/deepbook/sources/book/order_info.move b/packages/deepbook/sources/book/order_info.move index 8598d9fca..38cffb3ce 100644 --- a/packages/deepbook/sources/book/order_info.move +++ b/packages/deepbook/sources/book/order_info.move @@ -596,3 +596,45 @@ fun emit_order_canceled_maker_from_fill(self: &OrderInfo, fill: &Fill, timestamp timestamp, ) } + +// === Test Functions === +#[test_only] +public fun create_order_info_for_tests( + pool_id: ID, + balance_manager_id: ID, + order_id: u128, + trader: address, + price: u64, + original_quantity: u64, + executed_quantity: u64, + status: u8, +): OrderInfo { + let order_deep_price = deep_price::new_order_deep_price(true, constants::deep_multiplier()); + let mut order_info = OrderInfo { + pool_id, + order_id, + balance_manager_id, + client_order_id: 1, + trader, + order_type: constants::no_restriction(), + self_matching_option: constants::self_matching_allowed(), + price, + is_bid: true, + original_quantity, + order_deep_price, + expire_timestamp: constants::max_u64(), + executed_quantity, + cumulative_quote_quantity: 0, + fills: vector[], + fee_is_deep: true, + paid_fees: 0, + maker_fees: 0, + epoch: 0, + status, + market_order: false, + fill_limit_reached: false, + order_inserted: true, + timestamp: 0, + }; + order_info +} diff --git a/packages/deepbook/tests/balance_manager_tests.move b/packages/deepbook/tests/balance_manager_tests.move index d1e0e4184..cc0841064 100644 --- a/packages/deepbook/tests/balance_manager_tests.move +++ b/packages/deepbook/tests/balance_manager_tests.move @@ -527,7 +527,7 @@ fun test_withdraw_balance_too_low_e() { abort 0 } -public(package) fun deposit_into_account( +public fun deposit_into_account( balance_manager: &mut BalanceManager, amount: u64, test: &mut Scenario, @@ -538,11 +538,7 @@ public(package) fun deposit_into_account( ); } -public(package) fun create_acct_and_share_with_funds( - sender: address, - amount: u64, - test: &mut Scenario, -): ID { +public fun create_acct_and_share_with_funds(sender: address, amount: u64, test: &mut Scenario): ID { test.next_tx(sender); { let mut balance_manager = balance_manager::new(test.ctx()); @@ -560,7 +556,7 @@ public(package) fun create_acct_and_share_with_funds( } } -public(package) fun create_acct_and_share_with_funds_typed< +public fun create_acct_and_share_with_funds_typed< BaseAsset, QuoteAsset, ReferenceBaseAsset, diff --git a/packages/deepbook/tests/pool_tests.move b/packages/deepbook/tests/pool_tests.move index 0194341d8..f8433e395 100644 --- a/packages/deepbook/tests/pool_tests.move +++ b/packages/deepbook/tests/pool_tests.move @@ -1076,7 +1076,7 @@ fun check_pool_attributes( } #[test_only] -public(package) fun setup_test(owner: address, test: &mut Scenario): ID { +public fun setup_test(owner: address, test: &mut Scenario): ID { test.next_tx(owner); share_clock(test); share_registry_for_testing(test) @@ -1213,7 +1213,7 @@ public(package) fun setup_reference_pool_deep_as_base( } #[test_only] -public(package) fun setup_pool_with_default_fees( +public fun setup_pool_with_default_fees( sender: address, registry_id: ID, whitelisted_pool: bool, @@ -1292,7 +1292,7 @@ public(package) fun setup_default_permissionless_pool( #[test_only] /// Place a limit order -public(package) fun place_limit_order( +public fun place_limit_order( trader: address, pool_id: ID, balance_manager_id: ID, @@ -1355,7 +1355,7 @@ public(package) fun place_limit_order( #[test_only] /// Place an order -public(package) fun place_market_order( +public fun place_market_order( trader: address, pool_id: ID, balance_manager_id: ID, @@ -1399,7 +1399,7 @@ public(package) fun place_market_order( #[test_only] /// Cancel an order -public(package) fun cancel_order( +public fun cancel_order( sender: address, pool_id: ID, balance_manager_id: ID, @@ -1432,7 +1432,7 @@ public(package) fun cancel_order( #[test_only] /// Set the time in the global clock to 1_000_000 + current_time -public(package) fun set_time(current_time: u64, test: &mut Scenario) { +public fun set_time(current_time: u64, test: &mut Scenario) { test.next_tx(OWNER); { let mut clock = test.take_shared(); @@ -1442,7 +1442,7 @@ public(package) fun set_time(current_time: u64, test: &mut Scenario) { } #[test_only] -public(package) fun modify_order( +public fun modify_order( sender: address, pool_id: ID, balance_manager_id: ID, @@ -1532,7 +1532,7 @@ public(package) fun get_time(test: &mut Scenario): u64 { } #[test_only] -public(package) fun validate_open_orders( +public fun validate_open_orders( sender: address, pool_id: ID, balance_manager_id: ID, @@ -2118,7 +2118,7 @@ public(package) fun unregister_pool( } } -public(package) fun setup_pool_with_default_fees_and_reference_pool< +public fun setup_pool_with_default_fees_and_reference_pool< BaseAsset, QuoteAsset, ReferenceBaseAsset, From 9eed8d9a3b07ee145e04e6ba6fe09926d04136b0 Mon Sep 17 00:00:00 2001 From: avernikoz Date: Wed, 20 Aug 2025 22:09:10 +0300 Subject: [PATCH 2/5] add import Self in order_info.move --- packages/deepbook/sources/book/order_info.move | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deepbook/sources/book/order_info.move b/packages/deepbook/sources/book/order_info.move index 38cffb3ce..0eb67d0a2 100644 --- a/packages/deepbook/sources/book/order_info.move +++ b/packages/deepbook/sources/book/order_info.move @@ -8,7 +8,7 @@ module deepbook::order_info; use deepbook::{ balances::{Self, Balances}, constants, - deep_price::OrderDeepPrice, + deep_price::{Self, OrderDeepPrice}, fill::Fill, math, order::{Self, Order} From 8b0f6f918f41ad29a6fed793c40dfdd8d7306326 Mon Sep 17 00:00:00 2001 From: bathord Date: Tue, 26 Aug 2025 16:02:11 +0300 Subject: [PATCH 3/5] Change setup_reference_pool() visibility to public --- packages/deepbook/tests/pool_tests.move | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deepbook/tests/pool_tests.move b/packages/deepbook/tests/pool_tests.move index f8433e395..2d9f78028 100644 --- a/packages/deepbook/tests/pool_tests.move +++ b/packages/deepbook/tests/pool_tests.move @@ -1114,7 +1114,7 @@ public(package) fun add_deep_price_point< #[test_only] /// Set up a reference pool where Deep per base is 100 -public(package) fun setup_reference_pool( +public fun setup_reference_pool( sender: address, registry_id: ID, balance_manager_id: ID, From 49e17ab6867998ecb25b096c443f26f79616d88b Mon Sep 17 00:00:00 2001 From: bathord Date: Wed, 27 Aug 2025 20:49:41 +0300 Subject: [PATCH 4/5] Upd create_order_info_for_tests to receive is_bid & fee_is_deep --- packages/deepbook/sources/book/order_info.move | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/deepbook/sources/book/order_info.move b/packages/deepbook/sources/book/order_info.move index 0eb67d0a2..e4e767d56 100644 --- a/packages/deepbook/sources/book/order_info.move +++ b/packages/deepbook/sources/book/order_info.move @@ -608,6 +608,8 @@ public fun create_order_info_for_tests( original_quantity: u64, executed_quantity: u64, status: u8, + is_bid: bool, + fee_is_deep: bool, ): OrderInfo { let order_deep_price = deep_price::new_order_deep_price(true, constants::deep_multiplier()); let mut order_info = OrderInfo { @@ -619,14 +621,14 @@ public fun create_order_info_for_tests( order_type: constants::no_restriction(), self_matching_option: constants::self_matching_allowed(), price, - is_bid: true, + is_bid, original_quantity, order_deep_price, expire_timestamp: constants::max_u64(), executed_quantity, cumulative_quote_quantity: 0, fills: vector[], - fee_is_deep: true, + fee_is_deep, paid_fees: 0, maker_fees: 0, epoch: 0, From ea36baecb8320a38e3812ebe75c2996bfbeed7a1 Mon Sep 17 00:00:00 2001 From: bathord Date: Wed, 27 Aug 2025 20:50:17 +0300 Subject: [PATCH 5/5] Change add_deep_price_point visibility to public --- packages/deepbook/tests/pool_tests.move | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/deepbook/tests/pool_tests.move b/packages/deepbook/tests/pool_tests.move index 2d9f78028..54d456e03 100644 --- a/packages/deepbook/tests/pool_tests.move +++ b/packages/deepbook/tests/pool_tests.move @@ -1083,12 +1083,7 @@ public fun setup_test(owner: address, test: &mut Scenario): ID { } #[test_only] -public(package) fun add_deep_price_point< - BaseAsset, - QuoteAsset, - ReferenceBaseAsset, - ReferenceQuoteAsset, ->( +public fun add_deep_price_point( sender: address, target_pool_id: ID, reference_pool_id: ID,