Merge pull request #13 from initia-labs/feat/fix-build-deps

fix build deps
initia-labs · Mar 18, 2024 · 262ba95 · 262ba95
2 parents 88f9628 + 9a3c8da
commit 262ba95
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -23,15 +23,15 @@ log = { workspace = true }
 tempfile = { workspace = true }
 once_cell = { workspace = true }
 
-initia-move-natives = { workspace = true, features = ["testing"] }
-initia-move-gas = { workspace = true, features = ["testing"] }
+initia-move-natives = { workspace = true }
+initia-move-gas = { workspace = true }
 initia-move-types = { workspace = true }
 move-command-line-common = { workspace = true }
 move-cli = { workspace = true }
 move-core-types = { workspace = true }
 move-package = { workspace = true }
 move-unit-test = { workspace = true }
-move-vm-runtime = { workspace = true, features = ["testing"] }
+move-vm-runtime = { workspace = true }
 move-vm-types = { workspace = true }
 move-vm-test-utils = { workspace = true }
 move-binary-format = { workspace = true }
@@ -46,3 +46,11 @@ move-resource-viewer = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }
+initia-move-natives = { workspace = true, features = ["testing"] }
+initia-move-gas = { workspace = true, features = ["testing"] }
+move-vm-runtime = { workspace = true, features = ["testing"] }
+
+[build-dependencies]
+initia-move-natives = { workspace = true, features = ["testing"] }
+initia-move-gas = { workspace = true, features = ["testing"] }
+move-vm-runtime = { workspace = true, features = ["testing"] }
diff --git a/crates/e2e-move-tests/src/tests/move_unit.rs b/crates/e2e-move-tests/src/tests/move_unit.rs
@@ -10,8 +10,8 @@ use initia_move_gas::{
 use initia_move_natives::{
     account::NativeAccountContext, all_natives, block::NativeBlockContext, code::NativeCodeContext,
     cosmos::NativeCosmosContext, event::NativeEventContext, oracle::NativeOracleContext,
-    staking::NativeStakingContext, table::NativeTableContext,
-    transaction_context::NativeTransactionContext, query::NativeQueryContext,
+    query::NativeQueryContext, staking::NativeStakingContext, table::NativeTableContext,
+    transaction_context::NativeTransactionContext,
 };
 use move_cli::base::test::{run_move_unit_tests_with_gas_meter, UnitTestResult};
 use move_core_types::effects::ChangeSet;

diff --git a/crates/natives/src/query.rs b/crates/natives/src/query.rs
@@ -1,19 +1,25 @@
-use bech32::{Bech32, Hrp};
 use better_any::{Tid, TidAble};
 use initia_move_gas::{InternalGas, GAS_UNIT_SCALING_FACTOR};
 use initia_move_types::query::*;
 use move_binary_format::errors::PartialVMError;
+use move_core_types::gas_algebra::NumBytes;
 use move_core_types::vm_status::StatusCode;
-use move_core_types::{account_address::AccountAddress, gas_algebra::NumBytes};
 use move_vm_runtime::native_functions::NativeFunction;
 use move_vm_types::{
     loaded_data::runtime_types::Type,
     values::{Value, Vector},
 };
-use serde::{Deserialize, Serialize};
+
 use smallvec::{smallvec, SmallVec};
 use std::collections::{BTreeMap, VecDeque};
 
+#[cfg(feature = "testing")]
+use bech32::{Bech32, Hrp};
+#[cfg(feature = "testing")]
+use move_core_types::account_address::AccountAddress;
+#[cfg(feature = "testing")]
+use serde::{Deserialize, Serialize};
+
 use crate::{
     interface::{
         RawSafeNative, SafeNativeBuilder, SafeNativeContext, SafeNativeError, SafeNativeResult,