Skip to content

Commit d6c5aaa

Browse files
committed
strip test modules from std
1. Speedup compilation 2. std has a non-existing 0xA module, which is strange
1 parent e35af9b commit d6c5aaa

112 files changed

Lines changed: 181 additions & 8 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/movy-replay/src/exec.rs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ use itertools::Itertools;
1010
use move_trace_format::{format::MoveTraceBuilder, interface::Tracer};
1111
use move_vm_runtime::move_vm::MoveVM;
1212
use movy_sui::{compile::SuiCompiledPackage, database::cache::ObjectSuiStoreCommit};
13-
use movy_types::{error::MovyError, input::MoveAddress, object::MoveOwner};
13+
use movy_types::{
14+
error::MovyError,
15+
input::{MoveAddress, pprint_ptb},
16+
object::MoveOwner,
17+
};
1418
use sui_adapter_latest::execution_mode::{ExecutionMode, Normal};
1519
use sui_move_natives_latest::all_natives;
1620
use sui_types::{
@@ -207,6 +211,15 @@ where
207211
};
208212
trace!("Tx digest is {}", tx_data.digest());
209213

214+
match &tx_data.as_v1().kind {
215+
TransactionKind::ProgrammableTransaction(ptb) => {
216+
tracing::trace!("Ptb to execute:\n{}", pprint_ptb(ptb));
217+
}
218+
_ => {
219+
tracing::trace!("Tx to execute: {}", &tx_data.as_v1().kind);
220+
}
221+
}
222+
210223
let (store, gas_status, effects, _timing, result) =
211224
if let Some(target) = target_deployment_id {
212225
let _deploy = GlobalDeployment::new(&mut tx_data, target);

crates/movy-sui-stds/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ repository.workspace = true
99

1010
[dependencies]
1111
movy-sui = {workspace = true}
12+
movy-types = {workspace = true}
1213
bcs.workspace = true
1314

1415
[build-dependencies]

crates/movy-sui-stds/src/lib.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
use std::collections::BTreeMap;
2+
13
use movy_sui::compile::SuiCompiledPackage;
4+
use movy_types::{abi::MovePackageAbi, input::MoveAddress};
25

36
pub fn testing_std() -> Vec<SuiCompiledPackage> {
47
let bs = include_bytes!(concat!(env!("OUT_DIR"), "/std.testing"));
@@ -10,6 +13,15 @@ pub fn sui_std() -> Vec<SuiCompiledPackage> {
1013
bcs::from_bytes(bs).unwrap()
1114
}
1215

16+
pub fn std_abi(test: bool) -> BTreeMap<MoveAddress, MovePackageAbi> {
17+
let stds = if test { testing_std() } else { sui_std() };
18+
let mut out = BTreeMap::new();
19+
for std in stds {
20+
out.insert(std.package_id.into(), std.abi().unwrap());
21+
}
22+
out
23+
}
24+
1325
pub fn movy() -> SuiCompiledPackage {
1426
let bs = include_bytes!(concat!(env!("OUT_DIR"), "/movy"));
1527
bcs::from_bytes(bs).unwrap()

crates/movy-sui-stds/sui-framework/packages/bridge/tests/bridge_env.move renamed to crates/movy-sui-stds/sui-framework/packages/bridge/tests_disabled/bridge_env.move

File renamed without changes.

crates/movy-sui-stds/sui-framework/packages/bridge/tests/bridge_tests.move renamed to crates/movy-sui-stds/sui-framework/packages/bridge/tests_disabled/bridge_tests.move

File renamed without changes.

crates/movy-sui-stds/sui-framework/packages/bridge/tests/bridge_txns.move renamed to crates/movy-sui-stds/sui-framework/packages/bridge/tests_disabled/bridge_txns.move

File renamed without changes.

crates/movy-sui-stds/sui-framework/packages/bridge/tests/commitee_test.move renamed to crates/movy-sui-stds/sui-framework/packages/bridge/tests_disabled/commitee_test.move

File renamed without changes.

crates/movy-sui-stds/sui-framework/packages/bridge/tests/limiter_tests.move renamed to crates/movy-sui-stds/sui-framework/packages/bridge/tests_disabled/limiter_tests.move

File renamed without changes.

crates/movy-sui-stds/sui-framework/packages/bridge/tests/message_tests.move renamed to crates/movy-sui-stds/sui-framework/packages/bridge/tests_disabled/message_tests.move

File renamed without changes.

0 commit comments

Comments
 (0)