From 12730d88133f7b2a698ce6eee780fbf8fa9391e1 Mon Sep 17 00:00:00 2001 From: alnoki <43892045+alnoki@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:24:05 -0700 Subject: [PATCH] [Coverage] Uncomment inline, use mainnet dep The last commit tested Move code to 100% coverage, which was only possible by commenting out inline keywords and using a non-mainnet dependency per: https://github.com/aptos-labs/aptos-core/issues/9154 https://github.com/aptos-labs/aptos-core/pull/9181 --- src/move/econia/Move.toml | 7 ++++--- src/move/econia/sources/market.move | 2 +- src/move/econia/sources/user.move | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/move/econia/Move.toml b/src/move/econia/Move.toml index e0a457431..6507224eb 100644 --- a/src/move/econia/Move.toml +++ b/src/move/econia/Move.toml @@ -13,7 +13,8 @@ integrator = "0x4567" [dependencies.AptosFramework] git = "https://github.com/aptos-labs/aptos-core.git" -# You may need to change this to `main` to run event unit tests per -# https://github.com/aptos-labs/aptos-core/pull/9181 -rev = "main" +# You may need to change this to `main` to run event unit tests, pending +# https://github.com/aptos-labs/aptos-core/pull/9181 merging from `main` +# into `mainnet`. +rev = "mainnet" subdir = "aptos-move/framework/aptos-framework" diff --git a/src/move/econia/sources/market.move b/src/move/econia/sources/market.move index 6295fbf5c..10b317c19 100644 --- a/src/move/econia/sources/market.move +++ b/src/move/econia/sources/market.move @@ -2733,7 +2733,7 @@ module econia::market { /// /// * `Option`: An optional cancel reason, if the order needs /// to be cancelled. - /*inline*/ fun get_cancel_reason_option_for_market_order_or_swap( + inline fun get_cancel_reason_option_for_market_order_or_swap( self_match_taker_cancel: bool, base_traded: u64, max_base: u64, diff --git a/src/move/econia/sources/user.move b/src/move/econia/sources/user.move index 3c3e89bc0..7115902f5 100644 --- a/src/move/econia/sources/user.move +++ b/src/move/econia/sources/user.move @@ -2864,7 +2864,7 @@ module econia::user { /// Emit a `FillEvent` for the market account of the maker /// associated with a fill, if market event handles exist for the /// indicated market account. - /*inline*/ fun emit_maker_fill_event( + inline fun emit_maker_fill_event( event_ref: &FillEvent ) acquires MarketEventHandles { let maker = event_ref.maker;