Skip to content

Commit 2302fa1

Browse files
authored
fix: rename core modules to dt_ prefix to resolve namespace collisions (#125)
This PR renames the internal modules `math`, `order`, and `pool` to `dt_math`, `dt_order`, and `dt_pool` respectively. **Reasoning:** This is a workaround to bypass a known Sui Move compiler bug where automated address management (using `0x0` in `Move.toml`) causes namespace collisions when dependencies (like **DeepBook**) define modules with identical names. **References:** - Fixes namespace collisions with DeepBook's `math`, `order`, and `pool` modules. - Bypasses [Sui Issue #22194](MystenLabs/sui#22194) (Namespace collision in dependencies). - Bypasses [Sui Issue #20112](MystenLabs/sui#20112) (Namespace collision between packages' dependencies). --- ### Summary of Diff The changes affect 34 files, primarily updating module declarations and their corresponding imports in both source files and test suites: - `math.move` → `dt_math` - `order.move` → `dt_order` - `pool.move` → `dt_pool` - Updated references in `fee.move`, `fee_manager.move`, `helper.move`, and all associated unit tests.
2 parents 6df3ecc + c25fb37 commit 2302fa1

34 files changed

+52
-52
lines changed

packages/deeptrade-core/sources/fee.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module deeptrade_core::fee;
22

33
use deepbook::constants::fee_penalty_multiplier;
44
use deepbook::pool::Pool;
5+
use deeptrade_core::dt_math as math;
56
use deeptrade_core::helper::{
67
calculate_deep_required,
78
calculate_order_amount,
@@ -12,7 +13,6 @@ use deeptrade_core::helper::{
1213
apply_discount
1314
};
1415
use deeptrade_core::loyalty::LoyaltyProgram;
15-
use deeptrade_core::math;
1616
use deeptrade_core::ticket::{
1717
AdminTicket,
1818
validate_ticket,

packages/deeptrade-core/sources/fee_manager.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use deepbook::constants::{live, partially_filled};
55
use deepbook::order_info::OrderInfo;
66
use deepbook::pool::Pool;
77
use deeptrade_core::admin::AdminCap;
8-
use deeptrade_core::math;
8+
use deeptrade_core::dt_math as math;
99
use deeptrade_core::multisig_config::MultisigConfig;
1010
use deeptrade_core::treasury::{Treasury, join_protocol_fee};
1111
use sui::bag::{Self, Bag};

packages/deeptrade-core/sources/helper.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module deeptrade_core::helper;
22

33
use deepbook::constants::{live, partially_filled};
44
use deepbook::pool::Pool;
5-
use deeptrade_core::math;
5+
use deeptrade_core::dt_math as math;
66
use deeptrade_core::oracle;
77
use pyth::price_info::PriceInfoObject;
88
use std::type_name;

packages/deeptrade-core/sources/math.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Copyright (c) Deeptrade
33
// SPDX-License-Identifier: Apache-2.0
44

5-
module deeptrade_core::math;
5+
module deeptrade_core::dt_math;
66

77
/// scaling setting for float
88
const FLOAT_SCALING_U128: u128 = 1_000_000_000;

packages/deeptrade-core/sources/order.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module deeptrade_core::order;
1+
module deeptrade_core::dt_order;
22

33
use deepbook::balance_manager::{BalanceManager, TradeProof};
44
use deepbook::constants;

packages/deeptrade-core/sources/pool.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module deeptrade_core::pool;
1+
module deeptrade_core::dt_pool;
22

33
use deepbook::constants;
44
use deepbook::pool;

packages/deeptrade-core/tests/core/create_order_core.move

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#[test_only]
22
module deeptrade_core::create_order_core_tests;
33

4-
use deeptrade_core::fee::calculate_deep_reserves_coverage_order_fee;
5-
use deeptrade_core::helper::calculate_order_amount;
6-
use deeptrade_core::order::{
4+
use deeptrade_core::dt_order::{
75
create_order_core,
86
assert_deep_plan_eq,
97
assert_coverage_fee_plan_eq,
@@ -13,6 +11,8 @@ use deeptrade_core::order::{
1311
InputCoinDepositPlan,
1412
EInvalidInputCoinType
1513
};
14+
use deeptrade_core::fee::calculate_deep_reserves_coverage_order_fee;
15+
use deeptrade_core::helper::calculate_order_amount;
1616
use std::unit_test::assert_eq;
1717

1818
// ===== Constants =====

packages/deeptrade-core/tests/fee/validate_fees_against_max.move

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#[test_only]
22
module deeptrade_core::validate_fees_against_max_tests;
33

4-
use deeptrade_core::fee::calculate_deep_reserves_coverage_order_fee;
5-
use deeptrade_core::helper::apply_slippage;
6-
use deeptrade_core::order::{
4+
use deeptrade_core::dt_order::{
75
validate_fees_against_max,
86
EDeepRequiredExceedsMax,
97
ECoverageFeeExceedsMax,
108
EInvalidSlippage
119
};
10+
use deeptrade_core::fee::calculate_deep_reserves_coverage_order_fee;
11+
use deeptrade_core::helper::apply_slippage;
1212
use std::unit_test::assert_eq;
1313

1414
#[test]

packages/deeptrade-core/tests/helpers/apply_discount_tests.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#[test_only]
22
module deeptrade_core::apply_discount_tests;
33

4+
use deeptrade_core::dt_math as math;
45
use deeptrade_core::helper::{Self, EInvalidDiscountRate};
5-
use deeptrade_core::math;
66
use std::unit_test::assert_eq;
77

88
/// Test that applying zero discount returns the original value

packages/deeptrade-core/tests/helpers/apply_slippage_tests.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#[test_only]
22
module deeptrade_core::apply_slippage_tests;
33

4+
use deeptrade_core::dt_math as math;
45
use deeptrade_core::helper;
5-
use deeptrade_core::math;
66
use std::unit_test::assert_eq;
77

88
/// Test that applying slippage to zero value returns zero

0 commit comments

Comments
 (0)