Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor some parts of the verifier and add more mvir tests. #1742

Merged
merged 1 commit into from
May 26, 2024
Merged

Refactor some parts of the verifier and add more mvir tests. #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_copy.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
processed 1 task

task 0 'publish'. lines 1-11:
status ABORTED with code 10013 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
11 changes: 11 additions & 0 deletions ...ests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_copy.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//# publish
module 0x1.TestModule1 {
// error code 10013: INVALID_DATA_STRUCT_WITHOUT_COPY_ABILITY
struct S0 has drop {v: u64}

metadata {
data_struct {
0x1::TestModule1::S0 -> true;
}
}
}
4 changes: 4 additions & 0 deletions ...tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_drop.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
processed 1 task

task 0 'publish'. lines 1-11:
status ABORTED with code 10012 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
11 changes: 11 additions & 0 deletions ...ests/tests/cases/mvir_tests/data_struct/data_struct_invalid_data_struct_without_drop.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//# publish
module 0x1.TestModule1 {
// error code 10012: INVALID_DATA_STRUCT_WITHOUT_DROP_ABILITY
struct S0 has copy {v: u64}

metadata {
data_struct {
0x1::TestModule1::S0 -> true;
}
}
}
0 ...private_generics_invalid_module_owner.exp → ...ruct/data_struct_invalid_module_owner.exp
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions ...-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_invalid_module_owner.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//# publish
module 0x1.TestModule1 {
metadata {
data_struct {
// error code 10010: INVALID_MODULE_OWNER
0x123::SomeModule::Struct0 -> true;
}
}
}
0 ...sts/data_struct_malformed_struct_name.exp → ...uct/data_struct_malformed_struct_name.exp
View file
Open in desktop
File renamed without changes.
0 ...ts/data_struct_malformed_struct_name.mvir → ...ct/data_struct_malformed_struct_name.mvir
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions ...rooch-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_struct_not_exits.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
processed 1 task

task 0 'publish'. lines 1-11:
status ABORTED with code 10002 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
11 changes: 11 additions & 0 deletions ...ooch-framework-tests/tests/cases/mvir_tests/data_struct/data_struct_struct_not_exits.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//# publish
module 0x1.TestModule1 {
struct S0 has drop { x: u64 }

metadata {
data_struct {
// error code 10002: STRUCT_NOT_EXISTS
0x1::TestModule1::S1 -> true;
}
}
}
0 .../private_generics_function_not_exists.exp → .../private_generics_function_not_exists.exp
View file
Open in desktop
File renamed without changes.
0 ...private_generics_function_not_exists.mvir → ...private_generics_function_not_exists.mvir
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions ...k-tests/tests/cases/mvir_tests/private_generics/private_generics_invalid_module_owner.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
processed 1 task

task 0 'publish'. lines 1-9:
status ABORTED with code 10010 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
2 changes: 1 addition & 1 deletion ...rivate_generics_invalid_module_owner.mvir → ...rivate_generics_invalid_module_owner.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module 0x1.TestModule1 {
metadata {
private_generics {
// error code 10010: INVALID_MODULE_OWNER
0x123::SomeModule::f1 -> true;
0x123::SomeModule::f1 -> [0, 1];
}
}
}
0 ...vate_generics_malformed_function_name.exp → ...vate_generics_malformed_function_name.exp
View file
Open in desktop
File renamed without changes.
0 ...ate_generics_malformed_function_name.mvir → ...ate_generics_malformed_function_name.mvir
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions ...s/tests/cases/mvir_tests/private_generics/private_generics_not_allowed_primitive_type.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
processed 1 task

task 0 'publish'. lines 1-26:
status ABORTED with code 10011 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
26 changes: 26 additions & 0 deletions .../tests/cases/mvir_tests/private_generics/private_generics_not_allowed_primitive_type.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//# publish
module 0x1.TestModule1 {
metadata {
private_generics {
0x1::TestModule1::f1 -> [0, 1];
}
}

public f1<T1: copy+drop, T2: copy+drop>(arg1: T1, arg2: T1) {
label b0:
_ = move(arg1);
_ = move(arg2);
return;
}

public f2() {
let a1: u32;
let a2: u32;
label b0:
a1 = 123u32;
a2 = 456u32;
// error code 10011: INVALID_PRIVATE_GENERICS_TYPE
Self.f1<u32, u32>(copy(a1), copy(a2));
return;
}
}
2 changes: 1 addition & 1 deletion ...s/private_generics_not_allowed_struct.exp → ...s/private_generics_not_allowed_struct.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ task 0 'publish'. lines 1-8:
status EXECUTED

task 1 'publish'. lines 10-36:
status ABORTED with code 10008 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
status ABORTED with code 10011 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
2 changes: 1 addition & 1 deletion .../private_generics_not_allowed_struct.mvir → .../private_generics_not_allowed_struct.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module 0x1.TestModule1 {
label b0:
s0 = TestModule0.new();
s1 = TestModule0.new();
// error code 10008: INVALID_DATA_STRUCT
// error code 10011: INVALID_PRIVATE_GENERICS_TYPE
Self.f1<TestModule0.S0, TestModule0.S0>(move(s0), move(s1));
return;
}
Expand Down
0 ...te_generics_not_enough_type_parameter.exp → ...te_generics_not_enough_type_parameter.exp
View file
Open in desktop
File renamed without changes.
0 ...e_generics_not_enough_type_parameter.mvir → ...e_generics_not_enough_type_parameter.mvir
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions ...rk-tests/tests/cases/mvir_tests/private_generics/private_generics_too_many_parameters.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
processed 2 tasks

task 0 'publish'. lines 1-8:
status EXECUTED

task 1 'publish'. lines 10-36:
status ABORTED with code 10004 in 0000000000000000000000000000000000000000000000000000000000000002::move_module
36 changes: 36 additions & 0 deletions ...k-tests/tests/cases/mvir_tests/private_generics/private_generics_too_many_parameters.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//# publish
module 0x1.TestModule0 {
struct S0 has drop { x: u64 }
public new(): Self.S0 {
label b0:
return S0{ x: 123 };
}
}

//# publish
module 0x1.TestModule1 {
import 0x1.TestModule0;
metadata {
private_generics {
// error code 10004: TOO_MANY_PARAMETERS
0x1::TestModule1::f1 -> [1, 1, 1, 1, 1, 1];
}
}

public f1<T1: drop, T2: drop>(arg1: T1, arg2: T2) {
label b0:
_ = move(arg1);
_ = move(arg2);
return;
}

public f2() {
let s0: TestModule0.S0;
let s1: TestModule0.S0;
label b0:
s0 = TestModule0.new();
s1 = TestModule0.new();
Self.f1<TestModule0.S0, TestModule0.S0>(move(s0), move(s1));
return;
}
}
3 changes: 3 additions & 0 deletions moveos/moveos-verifier/src/error_code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ pub enum ErrorCode {
INVALID_DATA_STRUCT = 10008,
INVALID_DATA_STRUCT_TYPE = 10009,
INVALID_MODULE_OWNER = 10010,
INVALID_PRIVATE_GENERICS_TYPE = 10011,
INVALID_DATA_STRUCT_WITHOUT_DROP_ABILITY = 10012,
INVALID_DATA_STRUCT_WITHOUT_COPY_ABILITY = 10013,

INVALID_ENTRY_FUNC_SIGNATURE = 11000,
INVALID_PARAM_TYPE_ENTRY_FUNCTION = 11001,
Expand Down
Loading
Loading