diff --git a/packages/deepbook/sources/book/order_info.move b/packages/deepbook/sources/book/order_info.move index b2824f83e..f30ba563d 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} @@ -650,3 +650,47 @@ 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, + 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 { + 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, + original_quantity, + order_deep_price, + expire_timestamp: constants::max_u64(), + executed_quantity, + cumulative_quote_quantity: 0, + fills: vector[], + fee_is_deep, + 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 abb4adad7..14c6e08de 100644 --- a/packages/deepbook/tests/balance_manager_tests.move +++ b/packages/deepbook/tests/balance_manager_tests.move @@ -701,7 +701,7 @@ fun test_unauthorized_custom_owner_creation_e() { abort 0 } -public(package) fun deposit_into_account( +public fun deposit_into_account( balance_manager: &mut BalanceManager, amount: u64, test: &mut Scenario, @@ -712,11 +712,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()); @@ -762,7 +758,7 @@ public(package) fun asset_balance( } } -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 2ab8e8d13..9b6f90d04 100644 --- a/packages/deepbook/tests/pool_tests.move +++ b/packages/deepbook/tests/pool_tests.move @@ -1258,19 +1258,14 @@ 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) } #[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, @@ -1296,7 +1291,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, @@ -1395,7 +1390,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, @@ -1474,7 +1469,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, @@ -1537,7 +1532,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, @@ -1581,7 +1576,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, @@ -1614,7 +1609,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(); @@ -1624,7 +1619,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, @@ -1714,7 +1709,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, @@ -2300,7 +2295,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,