Skip to content

Commit

Permalink
Ensure that E2E tests don't point to old versions of core, std
Browse files Browse the repository at this point in the history
This is in preparation for addressing #799 and makes landing #825 a
little easier for the reasons described in #829.

We might wish to consider keeping these dependencies pointed at the
master branch, however this would be made easier by #830.
  • Loading branch information
mitchmindtree committed Feb 23, 2022
1 parent 382d62f commit aabeb6c
Show file tree
Hide file tree
Showing 59 changed files with 126 additions and 131 deletions.
22 changes: 11 additions & 11 deletions test/src/e2e_vm_tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,23 @@ pub fn run(filter_regex: Option<regex::Regex>) {
("const_decl", ProgramState::Return(100)),
("const_decl_in_library", ProgramState::Return(1)), // true
("aliased_imports", ProgramState::Return(42)),
("empty_method_initializer", ProgramState::Return(1)), // true
("b512_struct_alignment", ProgramState::Return(1)), // true
("generic_structs", ProgramState::Return(1)), // true
("generic_functions", ProgramState::Return(1)), // true
("generic_enum", ProgramState::Return(1)), // true
// Disabled pending field access and `Eq` impl for `b512` ("empty_method_initializer", ProgramState::Return(1)), // true
// Disabled pending field access and `Eq` impl for `b512` ("b512_struct_alignment", ProgramState::Return(1)), // true
("generic_structs", ProgramState::Return(1)), // true
("generic_functions", ProgramState::Return(1)), // true
("generic_enum", ProgramState::Return(1)), // true
("import_method_from_other_file", ProgramState::Return(10)), // true
("ec_recover_test", ProgramState::Return(1)), // true
("address_test", ProgramState::Return(1)), // true
("generic_struct", ProgramState::Return(1)), // true
("zero_field_types", ProgramState::Return(10)), // true
("assert_test", ProgramState::Return(1)), // true
("ec_recover_test", ProgramState::Return(1)), // true
("address_test", ProgramState::Return(1)), // true
("generic_struct", ProgramState::Return(1)), // true
("zero_field_types", ProgramState::Return(10)), // true
("assert_test", ProgramState::Return(1)), // true
("match_expressions", ProgramState::Return(42)),
("array_basics", ProgramState::Return(1)), // true
// Disabled, pending decision on runtime OOB checks. ("array_dynamic_oob", ProgramState::Revert(1)),
("array_generics", ProgramState::Return(1)), // true
("match_expressions_structs", ProgramState::Return(4)),
("b512_test", ProgramState::Return(1)), // true
// Disabled pending field access and `Eq` impl for `b512` ("b512_test", ProgramState::Return(1)), // true
("block_height", ProgramState::Return(1)), // true
("valid_impurity", ProgramState::Revert(0)), // false
("trait_override_bug", ProgramState::Return(7)),
Expand Down
3 changes: 0 additions & 3 deletions test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ license = "Apache-2.0"
name = "aliased_imports"
entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }


Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "auth_testing_contract"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
auth_testing_abi = { path = "../auth_testing_abi" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "b256_bad_jumps"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "b256_ops"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "b512_panic_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }

4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/b512_test/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "b512_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "bal_opcode"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
balance_test_abi = { path = "../balance_test_abi"}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "balance_test_contract"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
balance_test_abi = { path = "../balance_test_abi"}
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
balance_test_abi = { path = "../balance_test_abi"}
7 changes: 2 additions & 5 deletions test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ license = "Apache-2.0"
name = "basic_func_decl"
entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }


std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "basic_storage"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
basic_storage_abi = { path = "../basic_storage_abi" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/block_height/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "block_height"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "call_increment_contract"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
increment_abi = { path = "../increment_abi" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "caller_auth_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
auth_testing_abi = { path = "../auth_testing_abi" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "caller_context_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
context_testing_abi = { path = "../context_testing_abi" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "const_decl"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "const_decl_in_library"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ name = "context_testing_abi"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "context_testing_contract"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
context_testing_abi = { path = "../context_testing_abi"}
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
context_testing_abi = { path = "../context_testing_abi"}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }


4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "contract_id_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }


Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }


4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "ec_recover_test"
entry = "main.sw"

[dependencies]
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.1.0" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "empty_method_initializer"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
7 changes: 2 additions & 5 deletions test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ license = "Apache-2.0"
name = "enum_in_fn_decl"
entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }


std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ fn main() -> u64 {
Y: bool,
}

impl core::ops::Ord for X {
impl core::ops::Eq for X {
fn eq(self, other: Self) -> bool {
asm(r1: self, r2: other, r3) {
eq r3 r2 r1;
r3: bool
}
}
}

impl core::ops::Ord for X {
fn lt(self, other: Self) -> bool {
asm(r1: self, r2: other, r3) {
lt r3 r2 r1;
Expand All @@ -26,6 +29,7 @@ fn main() -> u64 {
}
}
}

if X::Y(true) == X::Y(true) {
a
} else {
Expand Down
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "eq_4_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "excess_fn_arguments"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
7 changes: 2 additions & 5 deletions test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ license = "Apache-2.0"
name = "asm_expr_basic"
entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }


std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/generic_enum/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "generic_enum"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ entry = "main.sw"

[dependencies]
increment_abi = { path = "../increment_abi" }
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }


Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "local_impl_for_ord"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
script;

use core::ops::Ord;
use core::ops::{Eq, Ord};

enum X {
Y: (),
}

impl Ord for X {
impl Eq for X {
fn eq(self, other: Self) -> bool {
true
}
}

impl Ord for X {
fn lt(self, other: Self) -> bool {
false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "match_expressions"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "match_expressions_enums"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
Loading

0 comments on commit aabeb6c

Please sign in to comment.