Skip to content

Commit

Permalink
fixup: Clean-up external crate tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@amnn
amnn committed Mar 28, 2024
1 parent 0601c33 commit d51428a
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 19 deletions.
1 change: 1 addition & 0 deletions external-crates/move/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

use crate::unit_tests::production_config;
use move_binary_format::{errors::VMResult, CompiledModule};
use move_bytecode_verifier::{meter::BoundMeter, verifier};
use move_bytecode_verifier::verifier;
use move_bytecode_verifier_meter::bound::BoundMeter;

#[allow(unused)]
fn run_binary_test(name: &str, bytes: &str) -> VMResult<()> {
Expand Down
2 changes: 1 addition & 1 deletion external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use crate::support::dummy_procedure_module;
use move_binary_format::file_format::Bytecode;
use move_bytecode_verifier_meter::dummy::DummyMeter;
use move_bytecode_verifier::CodeUnitVerifier;
use move_bytecode_verifier_meter::dummy::DummyMeter;
use move_core_types::vm_status::StatusCode;
use move_vm_config::verifier::VerifierConfig;

Expand Down
2 changes: 1 addition & 1 deletion external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use move_binary_format::{
file_format::{Bytecode, CompiledModule, FunctionDefinitionIndex, TableIndex},
};
use move_bytecode_verifier::control_flow;
use move_bytecode_verifier_meter::dummy::DummyMeter;;
use move_bytecode_verifier_meter::dummy::DummyMeter;
use move_core_types::vm_status::StatusCode;
use move_vm_config::verifier::VerifierConfig;

Expand Down
2 changes: 1 addition & 1 deletion external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

const NUM_LOCALS: u8 = 64;
Expand Down
4 changes: 1 addition & 3 deletions external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

use crate::unit_tests::production_config;
use move_binary_format::file_format::*;
use move_bytecode_verifier::{
limits::LimitsVerifier, verify_module_with_config_for_test,
};
use move_bytecode_verifier::{limits::LimitsVerifier, verify_module_with_config_for_test};
use move_bytecode_verifier_meter::dummy::DummyMeter;
use move_core_types::{
account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
Expand Down
2 changes: 1 addition & 1 deletion external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/locals.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

#[test]
Expand Down
2 changes: 1 addition & 1 deletion external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

const MAX_BASIC_BLOCKS: u16 = 1024;
Expand Down
2 changes: 1 addition & 1 deletion ...al-crates/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use crate::support::dummy_procedure_module;
use move_binary_format::file_format::Bytecode;
use move_bytecode_verifier_meter::dummy::DummyMeter;
use move_bytecode_verifier::CodeUnitVerifier;
use move_bytecode_verifier_meter::dummy::DummyMeter;
use move_core_types::vm_status::StatusCode;

#[test]
Expand Down
2 changes: 1 addition & 1 deletion external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

#[test]
Expand Down
3 changes: 1 addition & 2 deletions external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ use move_binary_format::file_format::{
Bytecode::*, CompiledModule, SignatureToken::*, Visibility::Public, *,
};
use move_bytecode_verifier::{
verify_module_unmetered, verify_module_with_config_for_test,
SignatureChecker,
verify_module_unmetered, verify_module_with_config_for_test, SignatureChecker,
};
use move_bytecode_verifier_meter::dummy::DummyMeter;
use move_core_types::{
Expand Down
2 changes: 1 addition & 1 deletion ...l-crates/move/move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ hex.workspace = true
invalid-mutations.workspace = true
move-binary-format = { workspace = true, features = ["fuzzing"] }
move-bytecode-verifier.workspace = true
move-bytecode-verifier-tests.workspace = true
move-bytecode-verifier-meter.workspace = true
move-core-types.workspace = true
move-vm-config.workspace = true

Expand Down
3 changes: 2 additions & 1 deletion ...cution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

use crate::unit_tests::production_config;
use move_binary_format::{errors::VMResult, CompiledModule};
use move_bytecode_verifier::{meter::BoundMeter, verifier};
use move_bytecode_verifier::verifier;
use move_bytecode_verifier_meter::bound::BoundMeter;

#[allow(unused)]
fn run_binary_test(name: &str, bytes: &str) -> VMResult<()> {
Expand Down
2 changes: 1 addition & 1 deletion ...ution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

const NUM_LOCALS: u8 = 64;
Expand Down
2 changes: 1 addition & 1 deletion ...move-execution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/locals.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

#[test]
Expand Down
2 changes: 1 addition & 1 deletion ...ution/v0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

const MAX_BASIC_BLOCKS: u16 = 1024;
Expand Down
2 changes: 1 addition & 1 deletion ...0/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use move_binary_format::file_format::{
IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
Visibility::Public,
};
use move_bytecode_verifier_meter::BoundMeter;
use move_bytecode_verifier_meter::bound::BoundMeter;
use move_core_types::{identifier::Identifier, vm_status::StatusCode};

#[test]
Expand Down

0 comments on commit d51428a

Please sign in to comment.