Skip to content

[cherry-pick][Move] Update tests to use unique addresses for different modules in tests (#19262) #19327

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

Merged
merged 1 commit into from
Sep 11, 2024
Merged

[cherry-pick][Move] Update tests to use unique addresses for different modules in tests (#19262) #19327

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ...rates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 1 task

task 0, lines 1-264:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: TOO_MANY_LOCALS,
sub_status: None,
location: undefined,
Expand Down
2 changes: 1 addition & 1 deletion ...ates/bytecode-verifier-transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
foo(p1: u8) {
let x1 : u8;
let x2 : u8;
Expand Down
2 changes: 1 addition & 1 deletion ...ates/move/crates/bytecode-verifier-transactional-tests/tests/check_bounds/256_locals.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
foo() {
let x1 : u8;
let x2 : u8;
Expand Down
2 changes: 1 addition & 1 deletion ...crates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ processed 1 task

task 0, lines 1-11:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
sub_status: None,
location: undefined,
Expand Down
2 changes: 1 addition & 1 deletion ...rates/bytecode-verifier-transactional-tests/tests/check_bounds/too_many_type_actuals.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
struct S { b: bool }

foo() {
Expand Down
2 changes: 1 addition & 1 deletion .../crates/bytecode-verifier-transactional-tests/tests/dependencies/call_integers_valid.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public fun plus256(a: u256): u256 { a + 1 }


//# publish
module 0x42::m_test {
module 0x43::m_test {
use 0x42::m;
public fun test8() { m::plus8(1u8); }
public fun test16() { m::plus16(1u16); }
Expand Down
12 changes: 6 additions & 6 deletions ...move/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@ processed 3 tasks

task 0, lines 1-51:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}

task 1, lines 53-70:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000007::M2'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M2,
location: 0x7::M2,
indices: [],
offsets: [],
}

task 2, lines 72-122:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000008::M3'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M3,
location: 0x8::M3,
indices: [],
offsets: [],
}
6 changes: 3 additions & 3 deletions ...ove/crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }

a<T>() {
Expand Down Expand Up @@ -51,7 +51,7 @@ module 0x1.M {
// loop: c#T1 --> c#T2 --> d#T --> b#T2 --S<T2>--> c#T1

//# publish
module 0x1.M2 {
module 0x7.M2 {
struct S<T> { b: bool }

f<T>() {
Expand All @@ -71,7 +71,7 @@ module 0x1.M2 {

//# publish

module 0x1.M3 {
module 0x8.M3 {
struct S<T> { b: bool }

a<T>() {
Expand Down
12 changes: 6 additions & 6 deletions ...crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1_enum.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@ processed 3 tasks

task 0, lines 1-51:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}

task 1, lines 53-70:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M2'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000007::M2'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M2,
location: 0x7::M2,
indices: [],
offsets: [],
}

task 2, lines 72-122:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M3'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000008::M3'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M3,
location: 0x8::M3,
indices: [],
offsets: [],
}
6 changes: 3 additions & 3 deletions ...rates/bytecode-verifier-transactional-tests/tests/instantiation_loops/complex_1_enum.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
enum S<T> { V{ b: bool } }

a<T>() {
Expand Down Expand Up @@ -51,7 +51,7 @@ module 0x1.M {
// loop: c#T1 --> c#T2 --> d#T --> b#T2 --S<T2>--> c#T1

//# publish
module 0x1.M2 {
module 0x7.M2 {
enum S<T> { V { b: bool } }

f<T>() {
Expand All @@ -71,7 +71,7 @@ module 0x1.M2 {

//# publish

module 0x1.M3 {
module 0x8.M3 {
enum S<T> { V{ b: bool } }

a<T>() {
Expand Down
2 changes: 1 addition & 1 deletion ...transactional-tests/tests/instantiation_loops/mutually_recursive_just_type_params_ok.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
f<T>() {
label b0:
Self.g<T>();
Expand Down
2 changes: 1 addition & 1 deletion ...transactional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }

f<T>() {
Expand Down
2 changes: 1 addition & 1 deletion ...actional-tests/tests/instantiation_loops/mutually_recursive_non_generic_type_ok_enum.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
enum S<T> { V{ b: bool } }

f<T>() {
Expand Down
2 changes: 1 addition & 1 deletion ...tests/instantiation_loops/mutually_recursive_three_args_just_type_params_shitfing_ok.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
f<T1, T2, T3>() {
label b0:
Self.g<T2, T3, T1>();
Expand Down
2 changes: 1 addition & 1 deletion ...ests/instantiation_loops/mutually_recursive_three_args_type_con_non_generic_types_ok.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }

f<T1, T2, T3>() {
Expand Down
4 changes: 2 additions & 2 deletions ...ional-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-23:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...onal-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }

f<T1, T2, T3>() {
Expand Down
4 changes: 2 additions & 2 deletions ...-tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting_enum.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-23:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...tests/tests/instantiation_loops/mutually_recursive_three_args_type_con_shifting_enum.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
enum S<T> { V{ b: bool } }

f<T1, T2, T3>() {
Expand Down
2 changes: 1 addition & 1 deletion ...s/tests/instantiation_loops/mutually_recursive_two_args_swapping_just_type_params_ok.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
f<T1, T2>() {
label b0:
Self.g<T2, T1>();
Expand Down
4 changes: 2 additions & 2 deletions ...ctional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-17:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...tional-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }

f<T1, T2>() {
Expand Down
4 changes: 2 additions & 2 deletions ...al-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con_enum.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-17:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...l-tests/tests/instantiation_loops/mutually_recursive_two_args_swapping_type_con_enum.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
enum S<T> { V { b: bool } }

f<T1, T2>() {
Expand Down
4 changes: 2 additions & 2 deletions ...de-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-20:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...e-verifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Not good: infinitely many types/instances.
// f<T>, g<S<T>>, f<S<T>>, g<S<S<T>>>, ...

module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }

f<T>() {
Expand Down
4 changes: 2 additions & 2 deletions ...rifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con_enum.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-20:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...ifier-transactional-tests/tests/instantiation_loops/mutually_recursive_type_con_enum.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Not good: infinitely many types/instances.
// f<T>, g<S<T>>, f<S<T>>, g<S<S<T>>>, ...

module 0x1.M {
module 0x6.M {
enum S<T> { V { b: bool } }

f<T>() {
Expand Down
4 changes: 2 additions & 2 deletions ...s/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1_enum.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-11:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion .../bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_1_enum.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//# publish
module 0x1.M {
module 0x6.M {
enum S<T> { V { b: bool }, R { } }

foo<T>() {
Expand Down
4 changes: 2 additions & 2 deletions ...crates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-13:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...rates/bytecode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//# publish

module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }
struct R<T1, T2> { b: bool }

Expand Down
4 changes: 2 additions & 2 deletions ...ode-verifier-transactional-tests/tests/instantiation_loops/nested_types_2_enum_struct.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ processed 1 task

task 0, lines 1-13:
//# publish
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000001::M'. Got VMError: {
Error: Unable to publish module '0000000000000000000000000000000000000000000000000000000000000006::M'. Got VMError: {
major_status: LOOP_IN_INSTANTIATION_GRAPH,
sub_status: None,
location: 0x1::M,
location: 0x6::M,
indices: [],
offsets: [],
}
2 changes: 1 addition & 1 deletion ...de-verifier-transactional-tests/tests/instantiation_loops/nested_types_2_enum_struct.mvir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//# publish

module 0x1.M {
module 0x6.M {
struct S<T> { b: bool }
enum R<T1, T2> { V{ b: bool } }

Expand Down
Loading
Loading