From 46a62d7c9bf4a5042ce57788af94a027d71943ea Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Tue, 8 Mar 2022 08:44:41 +1100 Subject: [PATCH] Update examples and E2E tests to use master branch of std, core (#876) * Update examples and E2E tests to use master branch of std, core This speeds up the E2E tests quite a bit, as previously many of them compiled two versions of `core` (e.g. `v0.0.1` as listed in `[dependencies]`, and `master` via the `std` dependency). Many tests have also had declared dependencies removed where unnecessary and irrelevant to the test. I did run into a couple issues: - I was unable to update `b512_panic_test`, `b512_test` and `empty_method_initializer` as the `lo` and `hi` bits fields no longer appear to be accessible on the `b512` type. For now I've left these pinned to the old versions. - The `context_testing_contract` test fails with: expected: `b256`, found: struct `ContractId`. Closes #875. * Fix `context_testing_contract` E2E test * Fix type mismatch in caller_context_test assertions due to new ContractId type * Update b512-related tests for removal of lo, hi fields in favour of bytes * Fix missed `key` -> `KEY` change in `increment_contract` when rebasing --- examples/fizzbuzz/Forc.lock | 11 +++------- examples/fizzbuzz/Forc.toml | 4 ++-- examples/hello_world/Forc.lock | 11 +++------- examples/hello_world/Forc.toml | 4 ++-- examples/subcurrency/Forc.lock | 11 +++------- examples/subcurrency/Forc.toml | 4 ++-- examples/wallet_smart_contract/Forc.lock | 11 +++------- examples/wallet_smart_contract/Forc.toml | 4 ++-- .../test_programs/address_test/Forc.lock | 12 ++--------- .../test_programs/address_test/Forc.toml | 3 +-- .../test_programs/aliased_imports/Forc.lock | 12 ++--------- .../test_programs/aliased_imports/Forc.toml | 6 +----- .../test_programs/array_basics/Forc.lock | 15 +------------- .../test_programs/array_basics/Forc.toml | 3 +-- .../test_programs/array_dynamic_oob/Forc.lock | 3 +++ .../test_programs/asm_expr_basic/Forc.lock | 7 ++----- .../test_programs/asm_expr_basic/Forc.toml | 3 +-- .../test_programs/assert_test/Forc.lock | 12 ++--------- .../test_programs/assert_test/Forc.toml | 3 +-- .../test_programs/assert_test/src/main.sw | 3 +-- .../auth_testing_contract/Forc.lock | 10 ++-------- .../auth_testing_contract/Forc.toml | 3 +-- .../test_programs/b256_bad_jumps/Forc.lock | 15 +------------- .../test_programs/b256_bad_jumps/Forc.toml | 3 +-- .../test_programs/b256_ops/Forc.lock | 12 ++--------- .../test_programs/b256_ops/Forc.toml | 3 +-- .../b512_struct_alignment/Forc.lock | 12 ++--------- .../b512_struct_alignment/Forc.toml | 4 +--- .../b512_struct_alignment/src/main.sw | 2 +- .../test_programs/b512_test/Forc.lock | 12 ++--------- .../test_programs/b512_test/Forc.toml | 3 +-- .../test_programs/b512_test/src/main.sw | 19 ++++++++---------- .../test_programs/bal_opcode/Forc.lock | 10 ++-------- .../test_programs/bal_opcode/Forc.toml | 3 +-- .../balance_test_contract/Forc.lock | 4 ++-- .../balance_test_contract/Forc.toml | 2 +- .../test_programs/basic_func_decl/Forc.lock | 15 +------------- .../test_programs/basic_func_decl/Forc.toml | 6 +----- .../test_programs/basic_storage/Forc.lock | 10 ++-------- .../test_programs/basic_storage/Forc.toml | 3 +-- .../test_programs/block_height/Forc.lock | 12 ++--------- .../test_programs/block_height/Forc.toml | 3 +-- .../call_basic_storage/Forc.toml | 1 + .../call_increment_contract/Forc.lock | 10 ++-------- .../call_increment_contract/Forc.toml | 3 +-- .../test_programs/caller_auth_test/Forc.lock | 10 ++-------- .../test_programs/caller_auth_test/Forc.toml | 3 +-- .../caller_context_test/Forc.lock | 12 +++-------- .../caller_context_test/Forc.toml | 3 +-- .../caller_context_test/src/main.sw | 4 ++-- .../test_programs/const_decl/Forc.lock | 15 +------------- .../test_programs/const_decl/Forc.toml | 3 +-- .../const_decl_in_library/Forc.lock | 15 +------------- .../const_decl_in_library/Forc.toml | 3 +-- .../context_testing_abi/Forc.lock | 4 ++-- .../context_testing_abi/Forc.toml | 2 +- .../context_testing_abi/src/main.sw | 4 ++-- .../context_testing_contract/Forc.lock | 6 +++--- .../context_testing_contract/Forc.toml | 2 +- .../context_testing_contract/src/main.sw | 4 ++-- .../test_programs/contract_abi_impl/Forc.lock | 18 ----------------- .../test_programs/contract_abi_impl/Forc.toml | 5 ----- .../test_programs/contract_call/Forc.lock | 18 ----------------- .../test_programs/contract_call/Forc.toml | 5 ----- .../test_programs/contract_id_test/Forc.lock | 12 ++--------- .../test_programs/contract_id_test/Forc.toml | 3 +-- .../test_programs/dependencies/Forc.lock | 20 +------------------ .../test_programs/dependencies/Forc.toml | 7 ------- .../dependency_parsing_error/Forc.lock | 20 +------------------ .../dependency_parsing_error/Forc.toml | 7 ------- .../test_programs/ec_recover_test/Forc.lock | 12 ++--------- .../test_programs/ec_recover_test/Forc.toml | 3 +-- .../empty_method_initializer/Forc.lock | 12 ++--------- .../empty_method_initializer/Forc.toml | 3 +-- .../empty_method_initializer/src/main.sw | 7 +------ .../test_programs/enum_in_fn_decl/Forc.lock | 7 ++----- .../test_programs/enum_in_fn_decl/Forc.toml | 4 +--- .../test_programs/eq_4_test/Forc.lock | 13 ------------ .../test_programs/eq_4_test/Forc.toml | 3 +-- .../excess_fn_arguments/Forc.lock | 13 ------------ .../excess_fn_arguments/Forc.toml | 3 +-- .../test_programs/fix_opcode_bug/Forc.lock | 15 +------------- .../test_programs/fix_opcode_bug/Forc.toml | 5 +---- .../test_programs/generic_enum/Forc.lock | 13 ------------ .../test_programs/generic_enum/Forc.toml | 3 +-- .../test_programs/if_elseif_enum/Forc.lock | 8 -------- .../test_programs/if_elseif_enum/Forc.toml | 3 +-- .../increment_contract/Forc.lock | 10 ++-------- .../increment_contract/Forc.toml | 3 +-- .../increment_contract/src/main.sw | 10 +++++----- .../infinite_dependencies/Forc.lock | 20 +------------------ .../infinite_dependencies/Forc.toml | 7 ------- .../inline_if_expr_const/Forc.lock | 7 ++----- .../inline_if_expr_const/Forc.toml | 3 +-- .../local_impl_for_ord/Forc.lock | 8 -------- .../local_impl_for_ord/Forc.toml | 3 +-- .../test_programs/match_expressions/Forc.lock | 13 ------------ .../test_programs/match_expressions/Forc.toml | 3 +-- .../match_expressions_enums/Forc.lock | 13 ------------ .../match_expressions_enums/Forc.toml | 3 +-- .../match_expressions_enums/src/main.sw | 5 ++++- .../match_expressions_structs/Forc.lock | 13 ------------ .../match_expressions_structs/Forc.toml | 3 +-- .../match_expressions_wrong_struct/Forc.lock | 13 ------------ .../match_expressions_wrong_struct/Forc.toml | 3 +-- .../missing_fn_arguments/Forc.lock | 13 ------------ .../missing_fn_arguments/Forc.toml | 3 +-- .../test_programs/modulo_uint_test/Forc.lock | 12 ++--------- .../test_programs/modulo_uint_test/Forc.toml | 3 +-- .../test_programs/multi_item_import/Forc.lock | 20 +------------------ .../test_programs/multi_item_import/Forc.toml | 7 ------- .../test_programs/name_shadowing/Forc.lock | 3 +++ .../test_programs/name_shadowing/Forc.toml | 4 ---- .../test_programs/neq_4_test/Forc.lock | 13 ------------ .../test_programs/neq_4_test/Forc.toml | 3 +-- .../new_allocator_test/Forc.lock | 7 ++----- .../new_allocator_test/Forc.toml | 3 +-- .../test_programs/op_precedence/Forc.lock | 15 +------------- .../test_programs/op_precedence/Forc.toml | 3 +-- .../test_programs/out_of_order_decl/Forc.lock | 20 +------------------ .../test_programs/out_of_order_decl/Forc.toml | 7 ------- .../predicate_calls_impure/src/main.sw | 1 - .../test_programs/size_of/Forc.lock | 12 ++--------- .../test_programs/size_of/Forc.toml | 3 +-- .../struct_field_access/Forc.lock | 20 +------------------ .../struct_field_access/Forc.toml | 7 ------- .../struct_field_reassignment/Forc.lock | 20 +------------------ .../struct_field_reassignment/Forc.toml | 7 ------- .../test_programs/supertraits/Forc.lock | 12 ++--------- .../test_programs/supertraits/Forc.toml | 3 +-- .../test_fuel_coin_abi/Forc.lock | 4 ++-- .../test_fuel_coin_abi/Forc.toml | 2 +- .../test_fuel_coin_contract/Forc.lock | 6 +++--- .../test_fuel_coin_contract/Forc.toml | 2 +- .../test_programs/token_ops_test/Forc.lock | 12 +++-------- .../test_programs/token_ops_test/Forc.toml | 3 +-- .../trait_import_with_star/src/main.sw | 1 - .../trait_override_bug/Forc.lock | 15 +------------- .../trait_override_bug/Forc.toml | 3 +-- .../trait_override_bug/src/main.sw | 1 - .../test_programs/tuple_desugaring/Forc.lock | 15 +------------- .../test_programs/tuple_desugaring/Forc.toml | 3 +-- .../test_programs/tuple_types/Forc.lock | 20 +------------------ .../test_programs/tuple_types/Forc.toml | 5 ----- .../test_programs/unary_not_basic/Forc.lock | 12 ++--------- .../test_programs/unary_not_basic/Forc.toml | 3 +-- .../test_programs/unary_not_basic_2/Forc.lock | 12 ++--------- .../test_programs/unary_not_basic_2/Forc.toml | 3 +-- .../test_programs/xos_opcode/Forc.lock | 12 ++--------- .../test_programs/xos_opcode/Forc.toml | 3 +-- 150 files changed, 193 insertions(+), 959 deletions(-) create mode 100644 test/src/e2e_vm_tests/test_programs/array_dynamic_oob/Forc.lock create mode 100644 test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.lock diff --git a/examples/fizzbuzz/Forc.lock b/examples/fizzbuzz/Forc.lock index 1c4fe42094c..b431f74b86f 100644 --- a/examples/fizzbuzz/Forc.lock +++ b/examples/fizzbuzz/Forc.lock @@ -3,19 +3,14 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'fizzbuzz' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/examples/fizzbuzz/Forc.toml b/examples/fizzbuzz/Forc.toml index 619fff8cfcb..07e6cbdad82 100644 --- a/examples/fizzbuzz/Forc.toml +++ b/examples/fizzbuzz/Forc.toml @@ -5,5 +5,5 @@ license = "Apache-2.0" name = "fizzbuzz" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/examples/hello_world/Forc.lock b/examples/hello_world/Forc.lock index 76e31a93b71..8765c49cbb7 100644 --- a/examples/hello_world/Forc.lock +++ b/examples/hello_world/Forc.lock @@ -3,19 +3,14 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'hello_world' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/examples/hello_world/Forc.toml b/examples/hello_world/Forc.toml index 94b709901b2..a4a0c8e4e29 100644 --- a/examples/hello_world/Forc.toml +++ b/examples/hello_world/Forc.toml @@ -5,5 +5,5 @@ license = "Apache-2.0" name = "hello_world" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/examples/subcurrency/Forc.lock b/examples/subcurrency/Forc.lock index 02490c26563..a2a1f26c472 100644 --- a/examples/subcurrency/Forc.lock +++ b/examples/subcurrency/Forc.lock @@ -3,19 +3,14 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'subcurrency' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] diff --git a/examples/subcurrency/Forc.toml b/examples/subcurrency/Forc.toml index 0dbb1f97a00..f25fe40b17c 100644 --- a/examples/subcurrency/Forc.toml +++ b/examples/subcurrency/Forc.toml @@ -5,5 +5,5 @@ license = "Apache-2.0" name = "subcurrency" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/examples/wallet_smart_contract/Forc.lock b/examples/wallet_smart_contract/Forc.lock index 7a9b8bd4717..85c121cd82f 100644 --- a/examples/wallet_smart_contract/Forc.lock +++ b/examples/wallet_smart_contract/Forc.lock @@ -3,19 +3,14 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'wallet_smart_contract' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] diff --git a/examples/wallet_smart_contract/Forc.toml b/examples/wallet_smart_contract/Forc.toml index f93086d461f..ba1271dc177 100644 --- a/examples/wallet_smart_contract/Forc.toml +++ b/examples/wallet_smart_contract/Forc.toml @@ -5,5 +5,5 @@ license = "Apache-2.0" name = "wallet_smart_contract" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/address_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/address_test/Forc.lock index d36eda53f16..754fed1428a 100644 --- a/test/src/e2e_vm_tests/test_programs/address_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/address_test/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'address_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.1.0#5ff3559f067f50c9550bf3d1b7c74f5cede78b6f', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.1.0#5ff3559f067f50c9550bf3d1b7c74f5cede78b6f' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/address_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/address_test/Forc.toml index 8e190dc5243..336cc4baee8 100644 --- a/test/src/e2e_vm_tests/test_programs/address_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/address_test/Forc.toml @@ -5,5 +5,4 @@ license = "Apache-2.0" name = "address_test" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.1.0" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.2" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.lock b/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.lock index 19922d767c7..c4192860b3a 100644 --- a/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'aliased_imports' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml b/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml index bf28f0d7be2..eeb1a85acd5 100644 --- a/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml @@ -4,9 +4,5 @@ license = "Apache-2.0" name = "aliased_imports" entry = "main.sw" - [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/array_basics/Forc.lock b/test/src/e2e_vm_tests/test_programs/array_basics/Forc.lock index 1788ce1e74c..8ad335af9bf 100644 --- a/test/src/e2e_vm_tests/test_programs/array_basics/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/array_basics/Forc.lock @@ -1,21 +1,8 @@ [[package]] name = 'array_basics' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/array_basics/Forc.toml b/test/src/e2e_vm_tests/test_programs/array_basics/Forc.toml index 9298cc4b8b2..eacd9cffc83 100644 --- a/test/src/e2e_vm_tests/test_programs/array_basics/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/array_basics/Forc.toml @@ -5,5 +5,4 @@ name = "array_basics" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/array_dynamic_oob/Forc.lock b/test/src/e2e_vm_tests/test_programs/array_dynamic_oob/Forc.lock new file mode 100644 index 00000000000..dd24a270bac --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/array_dynamic_oob/Forc.lock @@ -0,0 +1,3 @@ +[[package]] +name = 'array_dynamic_oob' +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.lock b/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.lock index cd18932625a..82bd84811ac 100644 --- a/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.lock @@ -1,9 +1,6 @@ [[package]] name = 'asm_expr_basic' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' @@ -12,5 +9,5 @@ dependencies = [] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.toml b/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.toml index 39548252783..f19ecaa983f 100644 --- a/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.toml @@ -5,5 +5,4 @@ name = "asm_expr_basic" entry = "main.sw" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core" } -std = { git = "http://github.com/FuelLabs/sway-lib-std" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/assert_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/assert_test/Forc.lock index 9b7c7d8fa39..67d8350db11 100644 --- a/test/src/e2e_vm_tests/test_programs/assert_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/assert_test/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'assert_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/assert_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/assert_test/Forc.toml index 0f4f788d5dd..4b0c03a0e42 100644 --- a/test/src/e2e_vm_tests/test_programs/assert_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/assert_test/Forc.toml @@ -5,5 +5,4 @@ name = "assert_test" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/assert_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/assert_test/src/main.sw index 9ad9e62efb6..08252837e06 100644 --- a/test/src/e2e_vm_tests/test_programs/assert_test/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/assert_test/src/main.sw @@ -1,6 +1,5 @@ script; -use std::chain::*; -use core::ops::*; +use std::chain::assert; // @todo add a test using this in a contract. // @todo add a test confirming that assert(false) does panic/revert diff --git a/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.lock index 026b8c19558..2ce7c9cffed 100644 --- a/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.lock @@ -6,8 +6,7 @@ dependencies = [] name = 'auth_testing_contract' dependencies = [ 'auth_testing_abi', - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] @@ -15,12 +14,7 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.toml index 889859fd4ef..7d3f43cb653 100644 --- a/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.toml @@ -5,6 +5,5 @@ license = "Apache-2.0" name = "auth_testing_contract" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } auth_testing_abi = { path = "../auth_testing_abi" } diff --git a/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.lock b/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.lock index a418a584d18..4aa2490d12e 100644 --- a/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.lock @@ -1,21 +1,8 @@ [[package]] name = 'b256_bad_jumps' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml b/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml index fbf7f9d1e97..4885565dea7 100644 --- a/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml @@ -5,5 +5,4 @@ name = "b256_bad_jumps" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.lock b/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.lock index 39faae0b077..b8f58be341a 100644 --- a/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'b256_ops' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml b/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml index ab4b0685e70..ba73c22a860 100644 --- a/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml @@ -5,5 +5,4 @@ name = "b256_ops" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.lock b/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.lock index 04ad879aa60..3361b941982 100644 --- a/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'b512_panic_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.toml b/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.toml index d644626c533..f5de0de3212 100644 --- a/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.toml @@ -5,6 +5,4 @@ name = "b512_panic_test" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/src/main.sw b/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/src/main.sw index 4dab4fa7aa0..9598d402993 100644 --- a/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/src/main.sw @@ -8,5 +8,5 @@ fn main() -> bool { let b: B512 = ~B512::from(hi_bits, lo_bits); - b.lo == lo_bits && b.hi == hi_bits + (b.bytes)[1] == lo_bits && (b.bytes)[0] == hi_bits } diff --git a/test/src/e2e_vm_tests/test_programs/b512_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/b512_test/Forc.lock index 17796d62d36..5639c8de22f 100644 --- a/test/src/e2e_vm_tests/test_programs/b512_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/b512_test/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'b512_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/b512_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/b512_test/Forc.toml index 4137f20fedf..c745ef293c7 100644 --- a/test/src/e2e_vm_tests/test_programs/b512_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/b512_test/Forc.toml @@ -5,5 +5,4 @@ name = "b512_test" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/b512_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/b512_test/src/main.sw index 94c89fa4868..dff40a0d1ba 100644 --- a/test/src/e2e_vm_tests/test_programs/b512_test/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/b512_test/src/main.sw @@ -6,7 +6,7 @@ use std::constants::ZERO; // helper to prove contiguity of memory in B512 type's hi & lo fields. fn are_fields_contiguous(big_value: B512) -> bool { - asm(r1: big_value.hi, r2: big_value.lo, r3, r4, r5, r6) { + asm(r1: (big_value.bytes)[0], r2: (big_value.bytes)[1], r3, r4, r5, r6) { move r3 sp; // Save a copy of SP in R3. cfei i64; // Reserve 512 bits of stack space. SP is now R3+64. mcpi r3 r1 i64; // Copy 64 bytes *starting at* big_value.hi (includes big_value.lo) @@ -25,26 +25,23 @@ fn main() -> bool { // it allows creation of new empty type: let mut a = ~B512::new(); - assert((a.hi == ZERO) && (a.lo == ZERO)); + assert(((a.bytes)[0] == ZERO) && ((a.bytes)[1] == ZERO)); // it allows reassignment of fields: - a.hi = hi_bits; - a.lo = lo_bits; - assert((a.hi == hi_bits) && (a.lo == lo_bits)); + a.bytes = [hi_bits, lo_bits]; + assert(((a.bytes)[0] == hi_bits) && ((a.bytes)[1] == lo_bits)); // it allows building from 2 b256's: let mut b = ~B512::from(hi_bits, lo_bits); - assert((b.hi == hi_bits) && (b.lo == lo_bits)); + assert(((b.bytes)[0] == hi_bits) && ((b.bytes)[1] == lo_bits)); // it allows reassignment of fields: - b.hi = modified; - b.lo = modified; - assert((b.hi == modified) && (b.lo == modified)); + b.bytes = [modified, modified]; + assert(((b.bytes)[0] == modified) && ((b.bytes)[1] == modified)); // it guarantees memory contiguity: let mut c = ~B512::new(); - c.hi = hi_bits; - c.lo = lo_bits; + c.bytes = [hi_bits, lo_bits]; assert(are_fields_contiguous(c)); true diff --git a/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.lock b/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.lock index c69ce69c2f1..7780a46f4a0 100644 --- a/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.lock @@ -2,8 +2,7 @@ name = 'bal_opcode' dependencies = [ 'balance_test_abi', - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] @@ -15,12 +14,7 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml b/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml index cb5623ac056..cc53834c84f 100644 --- a/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml @@ -5,6 +5,5 @@ license = "Apache-2.0" name = "bal_opcode" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } balance_test_abi = { path = "../balance_test_abi"} diff --git a/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.lock index 356847377f3..ce0a118a294 100644 --- a/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.lock @@ -6,7 +6,7 @@ dependencies = [] name = 'balance_test_contract' dependencies = [ 'balance_test_abi', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] @@ -16,5 +16,5 @@ dependencies = [] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.toml index cdd46e1714d..2b178abfa43 100644 --- a/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.toml @@ -5,5 +5,5 @@ license = "Apache-2.0" name = "balance_test_contract" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } balance_test_abi = { path = "../balance_test_abi"} diff --git a/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.lock b/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.lock index 55961a4d5ab..6daa33af5c7 100644 --- a/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.lock @@ -1,21 +1,8 @@ [[package]] name = 'basic_func_decl' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.toml b/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.toml index b1162fa8543..b59da775e96 100644 --- a/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.toml @@ -4,9 +4,5 @@ license = "Apache-2.0" name = "basic_func_decl" entry = "main.sw" - [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.lock b/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.lock index 5494cd51e47..b4bebf620be 100644 --- a/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.lock @@ -2,8 +2,7 @@ name = 'basic_storage' dependencies = [ 'basic_storage_abi', - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] @@ -15,12 +14,7 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml b/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml index 2d43696a5cb..e5544c8f34b 100644 --- a/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml @@ -5,6 +5,5 @@ license = "Apache-2.0" name = "basic_storage" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } basic_storage_abi = { path = "../basic_storage_abi" } diff --git a/test/src/e2e_vm_tests/test_programs/block_height/Forc.lock b/test/src/e2e_vm_tests/test_programs/block_height/Forc.lock index bfd2f466705..45e0f1f5f92 100644 --- a/test/src/e2e_vm_tests/test_programs/block_height/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/block_height/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'block_height' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/block_height/Forc.toml b/test/src/e2e_vm_tests/test_programs/block_height/Forc.toml index 1ff7f982edc..527f2da1c3c 100644 --- a/test/src/e2e_vm_tests/test_programs/block_height/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/block_height/Forc.toml @@ -5,5 +5,4 @@ name = "block_height" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/call_basic_storage/Forc.toml b/test/src/e2e_vm_tests/test_programs/call_basic_storage/Forc.toml index 7e6a1d6a494..d8387590f4b 100644 --- a/test/src/e2e_vm_tests/test_programs/call_basic_storage/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/call_basic_storage/Forc.toml @@ -6,6 +6,7 @@ name = "call_basic_storage" [dependencies.std] git = "http://github.com/FuelLabs/sway-lib-std" +branch = "master" [dependencies.basic_storage_abi] path = "../basic_storage_abi" diff --git a/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.lock index 792391b3c7b..14a03e55614 100644 --- a/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.lock @@ -1,9 +1,8 @@ [[package]] name = 'call_increment_contract' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', 'increment_abi', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] @@ -11,16 +10,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'increment_abi' dependencies = [] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.toml index c3824a73366..ae459870c8c 100644 --- a/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.toml @@ -5,6 +5,5 @@ license = "Apache-2.0" name = "call_increment_contract" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } increment_abi = { path = "../increment_abi" } diff --git a/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.lock index 3a0c37069c4..db1e45f1f94 100644 --- a/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.lock @@ -6,8 +6,7 @@ dependencies = [] name = 'caller_auth_test' dependencies = [ 'auth_testing_abi', - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] @@ -15,12 +14,7 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.toml index 1337dd28daf..fe8ff8ea628 100644 --- a/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.toml @@ -5,6 +5,5 @@ license = "Apache-2.0" name = "caller_auth_test" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } auth_testing_abi = { path = "../auth_testing_abi" } diff --git a/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.lock index 4d8c446aac1..d5c35272fd9 100644 --- a/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.lock @@ -2,25 +2,19 @@ name = 'caller_context_test' dependencies = [ 'context_testing_abi', - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd', ] [[package]] name = 'context_testing_abi' -dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226'] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.toml index 358265b49ea..1400884bfdf 100644 --- a/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.toml @@ -5,6 +5,5 @@ license = "Apache-2.0" name = "caller_context_test" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } context_testing_abi = { path = "../context_testing_abi" } diff --git a/test/src/e2e_vm_tests/test_programs/caller_context_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/caller_context_test/src/main.sw index 3490fbcc336..50374a6ba5e 100644 --- a/test/src/e2e_vm_tests/test_programs/caller_context_test/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/caller_context_test/src/main.sw @@ -17,7 +17,7 @@ fn main() -> bool { gas: gas, coins: 0, asset_id: ETH_ID } (); - assert(returned_contract_id == deployed_contract_id); + assert(returned_contract_id.into() == deployed_contract_id); // @todo set up a test contract to mint some tokens for testing balances. // test Context::this_balance(): @@ -46,7 +46,7 @@ fn main() -> bool { gas: gas, coins: amount, asset_id: ETH_ID } (); - assert(returned_asset_id == ETH_ID); + assert(returned_asset_id.into() == ETH_ID); // test Context::msg_gas(): // @todo expect the correct gas here... this should fail using `1000` diff --git a/test/src/e2e_vm_tests/test_programs/const_decl/Forc.lock b/test/src/e2e_vm_tests/test_programs/const_decl/Forc.lock index 63215378ee1..7ff8d2998a3 100644 --- a/test/src/e2e_vm_tests/test_programs/const_decl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/const_decl/Forc.lock @@ -1,21 +1,8 @@ [[package]] name = 'const_decl' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml b/test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml index 884aaf52649..4a88040281a 100644 --- a/test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml @@ -5,5 +5,4 @@ name = "const_decl" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.lock b/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.lock index 139279cfc96..28c09423105 100644 --- a/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.lock @@ -1,21 +1,8 @@ [[package]] name = 'const_decl_in_library' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.toml b/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.toml index f8cb4073c95..00591e9a549 100644 --- a/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.toml @@ -5,5 +5,4 @@ name = "const_decl_in_library" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.lock b/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.lock index d4b80e99082..51e0df78187 100644 --- a/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = 'context_testing_abi' -dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226'] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' @@ -9,5 +9,5 @@ dependencies = [] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.toml b/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.toml index 6d7e8e8b006..1bff570ec05 100644 --- a/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.toml @@ -5,4 +5,4 @@ license = "Apache-2.0" name = "context_testing_abi" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_abi/src/main.sw b/test/src/e2e_vm_tests/test_programs/context_testing_abi/src/main.sw index 3be8c403360..060e8a8a8ca 100644 --- a/test/src/e2e_vm_tests/test_programs/context_testing_abi/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/context_testing_abi/src/main.sw @@ -2,11 +2,11 @@ library context_testing_abi; use std::contract_id::ContractId; abi ContextTesting { - fn get_id() -> b256; + fn get_id() -> ContractId; fn get_this_balance(asset_id: b256) -> u64; fn get_balance_of_contract(asset_id: b256, contract_id: ContractId) -> u64; fn get_amount() -> u64; - fn get_asset_id() -> b256; + fn get_asset_id() -> ContractId; fn get_gas() -> u64; fn get_global_gas() -> u64; } diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.lock index 17f05ca49c2..65a071c2e2a 100644 --- a/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.lock @@ -1,12 +1,12 @@ [[package]] name = 'context_testing_abi' -dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226'] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'context_testing_contract' dependencies = [ 'context_testing_abi', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', ] [[package]] @@ -16,5 +16,5 @@ dependencies = [] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.toml index 1064cd6a41b..454bd0ad557 100644 --- a/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.toml @@ -5,5 +5,5 @@ license = "Apache-2.0" name = "context_testing_contract" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } context_testing_abi = { path = "../context_testing_abi"} diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/context_testing_contract/src/main.sw index b0465961b29..3ecd92d6abd 100644 --- a/test/src/e2e_vm_tests/test_programs/context_testing_contract/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/context_testing_contract/src/main.sw @@ -4,7 +4,7 @@ use std::{context::*, contract_id::ContractId}; use context_testing_abi::*; impl ContextTesting for Contract { - fn get_id() -> b256 { + fn get_id() -> ContractId { contract_id() } @@ -20,7 +20,7 @@ impl ContextTesting for Contract { msg_amount() } - fn get_asset_id() -> b256 { + fn get_asset_id() -> ContractId { msg_asset_id() } diff --git a/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.lock b/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.lock index cd692f1e173..58c35d01626 100644 --- a/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.lock @@ -1,21 +1,3 @@ [[package]] name = 'contract_abi_impl' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.toml b/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.toml index bb42a0c32eb..2beb8679af4 100644 --- a/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.toml @@ -3,8 +3,3 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" name = "contract_abi_impl" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } diff --git a/test/src/e2e_vm_tests/test_programs/contract_call/Forc.lock b/test/src/e2e_vm_tests/test_programs/contract_call/Forc.lock index ea1f136d595..3755841f48c 100644 --- a/test/src/e2e_vm_tests/test_programs/contract_call/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/contract_call/Forc.lock @@ -1,21 +1,3 @@ [[package]] name = 'contract_call' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml b/test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml index 43de3e5ac81..5c241af11de 100644 --- a/test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml @@ -3,8 +3,3 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" name = "contract_call" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } diff --git a/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.lock index d11622df995..d1da9c2e5fc 100644 --- a/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.lock @@ -1,21 +1,13 @@ [[package]] name = 'contract_id_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.toml index 9fe666cc673..aee0fbc52a9 100644 --- a/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.toml @@ -5,5 +5,4 @@ name = "contract_id_test" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/dependencies/Forc.lock b/test/src/e2e_vm_tests/test_programs/dependencies/Forc.lock index 825fe1edf93..dbd654f00c0 100644 --- a/test/src/e2e_vm_tests/test_programs/dependencies/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/dependencies/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'dependencies' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml b/test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml index 2129646dc13..03b9cc81b67 100644 --- a/test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml @@ -3,10 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "dependencies" entry = "main.sw" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - diff --git a/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.lock b/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.lock index 43f4d5745ca..dc2d9a1f7bd 100644 --- a/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'dependencies_parsing_error' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.toml b/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.toml index 9d615ae76d8..8883c6fc6bd 100644 --- a/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/dependency_parsing_error/Forc.toml @@ -3,10 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "dependencies_parsing_error" entry = "main.sw" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - diff --git a/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.lock index c0e923677a3..f3ac314d4f8 100644 --- a/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'ec_recover_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.toml index b473109d224..1c6ac56b0a9 100644 --- a/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/ec_recover_test/Forc.toml @@ -5,5 +5,4 @@ name = "ec_recover_test" entry = "main.sw" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.1.0" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.lock b/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.lock index 136079c7447..c452104f939 100644 --- a/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'empty_method_initializer' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.toml b/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.toml index ea4ef51922a..408c8931f6b 100644 --- a/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/empty_method_initializer/Forc.toml @@ -5,5 +5,4 @@ name = "empty_method_initializer" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/empty_method_initializer/src/main.sw b/test/src/e2e_vm_tests/test_programs/empty_method_initializer/src/main.sw index 44d0faeac6d..7554ee19149 100644 --- a/test/src/e2e_vm_tests/test_programs/empty_method_initializer/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/empty_method_initializer/src/main.sw @@ -6,12 +6,7 @@ fn main() -> bool { let hi_bits: b256 = 0x7777777777777777777777777777777777777777777777777777777777777777; let lo_bits: b256 = 0x0000000000000000000000000000000000000000000000000000000000000000; - let b = ~B512::from(hi_bits, lo_bits); let other_b = ~B512::new(); - (b.hi != other_b.hi) && (b.lo == other_b.lo) + ((b.bytes)[0] != (other_b.bytes)[0]) && ((b.bytes)[1] == (other_b.bytes)[1]) } - - - - diff --git a/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.lock b/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.lock index 53afd911d57..8cc3dc74548 100644 --- a/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.lock @@ -5,12 +5,9 @@ dependencies = [] [[package]] name = 'enum_in_fn_decl' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.toml b/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.toml index bd40b958b44..1531fd550fe 100644 --- a/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.toml @@ -4,7 +4,5 @@ license = "Apache-2.0" name = "enum_in_fn_decl" entry = "main.sw" - [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.1.0" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.lock index 21c8eb7c874..2d87e974185 100644 --- a/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'eq_4_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.toml index 34a82f0865b..b270ddf6461 100644 --- a/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.toml @@ -5,5 +5,4 @@ name = "eq_4_test" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.lock b/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.lock index 7aeebec604c..543a3f0f1d9 100644 --- a/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'excess_fn_arguments' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.toml b/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.toml index 76d700d0bd2..2e029b63a33 100644 --- a/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/excess_fn_arguments/Forc.toml @@ -5,5 +5,4 @@ name = "excess_fn_arguments" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.lock b/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.lock index 855ca596444..77ddb688a3d 100644 --- a/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.lock @@ -1,21 +1,8 @@ [[package]] name = 'asm_expr_basic' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.toml b/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.toml index 670eb5bab87..df665885003 100644 --- a/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.toml @@ -6,7 +6,4 @@ entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.lock b/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.lock index 3bcae2c4c09..71703c8777c 100644 --- a/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'generic_enum' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.toml b/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.toml index fde515dfbb5..995b1ec2cd7 100644 --- a/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/generic_enum/Forc.toml @@ -5,5 +5,4 @@ name = "generic_enum" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.lock b/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.lock index e35a9045980..1bbdf9a471f 100644 --- a/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.lock @@ -5,12 +5,4 @@ dependencies = [] [[package]] name = 'if_elseif_enum' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.toml b/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.toml index 96c27e26aff..634cfae2ea6 100644 --- a/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.toml @@ -6,5 +6,4 @@ name = "if_elseif_enum" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.1.0" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.lock index 2db17084420..02461018c1b 100644 --- a/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.lock @@ -3,11 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'increment_abi' dependencies = [] @@ -15,12 +10,11 @@ dependencies = [] [[package]] name = 'increment_contract' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', 'increment_abi', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd', ] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.toml index e2e47f9dcc6..5a6d3a2231e 100644 --- a/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/increment_contract/Forc.toml @@ -6,5 +6,4 @@ name = "increment_contract" [dependencies] increment_abi = { path = "../increment_abi" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/increment_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/increment_contract/src/main.sw index 99a3e34608b..d8d9e317474 100644 --- a/test/src/e2e_vm_tests/test_programs/increment_contract/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/increment_contract/src/main.sw @@ -3,18 +3,18 @@ contract; use increment_abi::Incrementor; use std::storage::{get, store}; -const key = 0x0000000000000000000000000000000000000000000000000000000000000000; +const KEY = 0x0000000000000000000000000000000000000000000000000000000000000000; impl Incrementor for Contract { fn initialize(initial_value: u64) -> u64 { - store(key, initial_value); + store(KEY, initial_value); initial_value } fn increment(increment_by: u64) -> u64 { - let new_val = get::(key) + 1; + let new_val = get::(KEY) + 1; // check that monomorphization doesn't overwrite the type of the above - let dummy = get::(key) + 1; - store(key, new_val); + let dummy = get::(KEY) + 1; + store(KEY, new_val); new_val } } diff --git a/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.lock b/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.lock index 260adac0a4d..2e6d2d8ead1 100644 --- a/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'infinite_dependencies' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.toml b/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.toml index 5677f21a5c7..f1f71f00c5f 100644 --- a/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/infinite_dependencies/Forc.toml @@ -3,10 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "infinite_dependencies" entry = "main.sw" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - diff --git a/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.lock b/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.lock index db942ff5698..5ebea793972 100644 --- a/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.lock @@ -5,12 +5,9 @@ dependencies = [] [[package]] name = 'inline_if_expr_const' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.toml b/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.toml index aaee720f438..6700bad31ad 100644 --- a/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/inline_if_expr_const/Forc.toml @@ -5,5 +5,4 @@ license = "Apache-2.0" name = "inline_if_expr_const" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core" } -std = { git = "http://github.com/FuelLabs/sway-lib-std" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.lock b/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.lock index 0b6e1c57516..703d9aa983e 100644 --- a/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.lock @@ -5,12 +5,4 @@ dependencies = [] [[package]] name = 'local_impl_for_ord' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.1.0#a5b57846089e141c6d205d0037369eb49227caa7' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.toml b/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.toml index 8ce5e4950d4..fa6f37bef70 100644 --- a/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/local_impl_for_ord/Forc.toml @@ -5,5 +5,4 @@ name = "local_impl_for_ord" entry = "main.sw" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.1.0" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.lock b/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.lock index 353684eb8d1..049ab1a5a1d 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'match_expressions' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.toml b/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.toml index 599a5dfff98..a8c5495a516 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/match_expressions/Forc.toml @@ -5,5 +5,4 @@ name = "match_expressions" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.lock b/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.lock index 52d85a0e661..21dbc317056 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'match_expressions_enums' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.toml b/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.toml index a3f6c3e019d..352889d459c 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/match_expressions_enums/Forc.toml @@ -5,5 +5,4 @@ name = "match_expressions_enums" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions_enums/src/main.sw b/test/src/e2e_vm_tests/test_programs/match_expressions_enums/src/main.sw index 0a44f59318d..f232c1f3d0b 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions_enums/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/match_expressions_enums/src/main.sw @@ -4,13 +4,16 @@ enum X { Y: u64, } -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; diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.lock b/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.lock index 4a39b926e2e..358eaba400f 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'match_expressions_structs' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.toml b/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.toml index 5f5cc1cd49f..c934bf1826a 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/match_expressions_structs/Forc.toml @@ -5,5 +5,4 @@ name = "match_expressions_structs" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.lock b/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.lock index 8a868815b54..1402fbfd304 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'match_expressions_wrong_struct' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.toml b/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.toml index 7546bf77135..594542b6c7c 100644 --- a/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/match_expressions_wrong_struct/Forc.toml @@ -5,5 +5,4 @@ name = "match_expressions_wrong_struct" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.lock b/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.lock index a50c26e8727..d28e0ba49c1 100644 --- a/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'missing_fn_arguments' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.toml b/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.toml index 3c6674a07b9..4a7f7817326 100644 --- a/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/missing_fn_arguments/Forc.toml @@ -5,5 +5,4 @@ name = "missing_fn_arguments" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.lock index 597db74fa9c..0c6ca8e610b 100644 --- a/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'modulo_uint_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.toml index 278554df0ae..e71b6bec819 100644 --- a/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/modulo_uint_test/Forc.toml @@ -5,5 +5,4 @@ name = "modulo_uint_test" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.lock b/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.lock index 8d9acba44c6..0fc8ce1d5a8 100644 --- a/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'multi_item_import' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.toml b/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.toml index 4d1a4ef4fb0..1c8d0425a7b 100644 --- a/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/multi_item_import/Forc.toml @@ -3,10 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "multi_item_import" entry = "main.sw" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - diff --git a/test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.lock b/test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.lock new file mode 100644 index 00000000000..b3a11fc5dd9 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.lock @@ -0,0 +1,3 @@ +[[package]] +name = 'name_shadowing' +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.toml b/test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.toml index aadc4245752..9a3ab83e52b 100644 --- a/test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/name_shadowing/Forc.toml @@ -3,7 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "name_shadowing" entry = "main.sw" - -[dependencies] -std = { path = "../../../../../lib-std" } -core = { path = "../../../../../lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.lock index 8abbf05a254..1f264018f66 100644 --- a/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'neq_4_test' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.toml index 210b343738b..a93dc16a4f1 100644 --- a/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/neq_4_test/Forc.toml @@ -5,5 +5,4 @@ name = "neq_4_test" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.lock index 0e6f48cde48..6281fe6fef3 100644 --- a/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.lock @@ -5,12 +5,9 @@ dependencies = [] [[package]] name = 'new_alloc' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.toml index 6b7f185fbd2..46a3ecc3b03 100644 --- a/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/new_allocator_test/Forc.toml @@ -5,5 +5,4 @@ license = "Apache-2.0" name = "new_alloc" [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", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.lock b/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.lock index b4cc9f4dd50..631c8cc6da4 100644 --- a/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] - [[package]] name = 'unary_not_basic' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.toml b/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.toml index 25d6f0baaa7..93ecd502056 100644 --- a/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/op_precedence/Forc.toml @@ -5,5 +5,4 @@ name = "unary_not_basic" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.lock b/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.lock index 2b86709f4ca..a8c6656a45a 100644 --- a/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'out_of_order_decl' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.toml b/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.toml index a9c12ba0892..6b440a88892 100644 --- a/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/out_of_order_decl/Forc.toml @@ -3,10 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "out_of_order_decl" entry = "main.sw" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - diff --git a/test/src/e2e_vm_tests/test_programs/predicate_calls_impure/src/main.sw b/test/src/e2e_vm_tests/test_programs/predicate_calls_impure/src/main.sw index 4d17ed8eb08..f5ef21ad7e2 100644 --- a/test/src/e2e_vm_tests/test_programs/predicate_calls_impure/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/predicate_calls_impure/src/main.sw @@ -5,7 +5,6 @@ fn main() { foo() } - impure fn foo() { } diff --git a/test/src/e2e_vm_tests/test_programs/size_of/Forc.lock b/test/src/e2e_vm_tests/test_programs/size_of/Forc.lock index 639543f230d..409a20e99c9 100644 --- a/test/src/e2e_vm_tests/test_programs/size_of/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/size_of/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'size_of' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/size_of/Forc.toml b/test/src/e2e_vm_tests/test_programs/size_of/Forc.toml index 70e6ac8c310..37e6e05b455 100644 --- a/test/src/e2e_vm_tests/test_programs/size_of/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/size_of/Forc.toml @@ -5,5 +5,4 @@ license = "Apache-2.0" name = "size_of" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.lock b/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.lock index a482952ef34..2032046dfb4 100644 --- a/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] - [[package]] name = 'struct_field_access' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.toml b/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.toml index bfc33829c4c..8b94181f84a 100644 --- a/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/struct_field_access/Forc.toml @@ -3,10 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "struct_field_access" entry = "main.sw" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - diff --git a/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.lock b/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.lock index 9c049dff7f7..43e2e79d771 100644 --- a/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] - [[package]] name = 'struct_field_reassignment' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.toml b/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.toml index 402978da7a2..1a2e38522b0 100644 --- a/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/struct_field_reassignment/Forc.toml @@ -3,10 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "struct_field_reassignment" entry = "main.sw" - - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - - diff --git a/test/src/e2e_vm_tests/test_programs/supertraits/Forc.lock b/test/src/e2e_vm_tests/test_programs/supertraits/Forc.lock index 9f8ff5db494..b97010e7c20 100644 --- a/test/src/e2e_vm_tests/test_programs/supertraits/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/supertraits/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'supertraits' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] diff --git a/test/src/e2e_vm_tests/test_programs/supertraits/Forc.toml b/test/src/e2e_vm_tests/test_programs/supertraits/Forc.toml index edfd7ae143c..a745268f036 100644 --- a/test/src/e2e_vm_tests/test_programs/supertraits/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/supertraits/Forc.toml @@ -5,5 +5,4 @@ license = "Apache-2.0" name = "supertraits" [dependencies] -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.lock b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.lock index ba489976af9..3995b096bfc 100644 --- a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.lock @@ -5,9 +5,9 @@ dependencies = [] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920'] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] diff --git a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.toml b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.toml index ab3801c2251..e7a123b4d4e 100644 --- a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_abi/Forc.toml @@ -5,4 +5,4 @@ license = "Apache-2.0" name = "test_fuel_coin_abi" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.2" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.lock index 0f5a691a072..baf54992fe4 100644 --- a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.lock @@ -5,16 +5,16 @@ dependencies = [] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920'] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'test_fuel_coin_contract' dependencies = [ - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd', 'test_fuel_coin_abi', ] diff --git a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.toml index 93505ecba2f..184922aec9b 100644 --- a/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/test_fuel_coin_contract/Forc.toml @@ -5,5 +5,5 @@ license = "Apache-2.0" name = "test_fuel_coin_contract" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.2" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } test_fuel_coin_abi = { path = "../test_fuel_coin_abi" } diff --git a/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.lock index 7c77eb8c036..39b5931e897 100644 --- a/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.lock @@ -3,24 +3,18 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.1.0#5ff3559f067f50c9550bf3d1b7c74f5cede78b6f' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920'] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] [[package]] name = 'token_ops_test' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.1.0#5ff3559f067f50c9550bf3d1b7c74f5cede78b6f', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.2#888f0abce5621525af7b8bc6d41a1a570f30c920', + 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd', 'test_fuel_coin_abi', ] diff --git a/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.toml index 848643fd2be..75360dfc3c2 100644 --- a/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/token_ops_test/Forc.toml @@ -5,6 +5,5 @@ license = "Apache-2.0" name = "token_ops_test" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.2" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.1.0" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } test_fuel_coin_abi = { path = "../test_fuel_coin_abi" } diff --git a/test/src/e2e_vm_tests/test_programs/trait_import_with_star/src/main.sw b/test/src/e2e_vm_tests/test_programs/trait_import_with_star/src/main.sw index 79acd90a3e7..986b520d465 100644 --- a/test/src/e2e_vm_tests/test_programs/trait_import_with_star/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/trait_import_with_star/src/main.sw @@ -2,7 +2,6 @@ script; dep shiftable; use shiftable::*; - fn main() { let mut shiftAnswer: u64 = 0; diff --git a/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.lock b/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.lock index a78d9940b57..accf1277bcb 100644 --- a/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] - [[package]] name = 'trait_override_bug' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#c3f1b914c7099d5115c72c01fd0ea640cc3ad6dc', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.toml b/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.toml index 2cb4ba0b2b2..952569c0721 100644 --- a/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/trait_override_bug/Forc.toml @@ -5,5 +5,4 @@ entry = "main.sw" license = "Apache-2.0" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/trait_override_bug/src/main.sw b/test/src/e2e_vm_tests/test_programs/trait_override_bug/src/main.sw index 80f118aaa26..948af1db64b 100644 --- a/test/src/e2e_vm_tests/test_programs/trait_override_bug/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/trait_override_bug/src/main.sw @@ -1,6 +1,5 @@ script; - // This bug was found by Nebula in discord. Adding this trait was causing other implementations on u64s to be overridden. pub trait Shiftable { diff --git a/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.lock b/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.lock index 8c6cdc2050f..032ca614d95 100644 --- a/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.lock @@ -3,19 +3,6 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] - [[package]] name = 'tuple_desugaring' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] diff --git a/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.toml b/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.toml index 8f72b7aeef1..9b2c40fff33 100644 --- a/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/tuple_desugaring/Forc.toml @@ -5,6 +5,5 @@ name = "tuple_desugaring" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.lock b/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.lock index 7050e78319e..ec6bfc44c22 100644 --- a/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.lock @@ -1,21 +1,3 @@ -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - -[[package]] -name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] - [[package]] name = 'tuple_types' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.toml b/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.toml index 392e466cd89..d6d6aef5425 100644 --- a/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/tuple_types/Forc.toml @@ -3,8 +3,3 @@ authors = ["Fuel Labs "] license = "Apache-2.0" name = "tuple_types" entry = "main.sw" - -[dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } - diff --git a/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.lock b/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.lock index b4cc9f4dd50..627685f2a4a 100644 --- a/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'unary_not_basic' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] diff --git a/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.toml b/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.toml index 25d6f0baaa7..46e6dff3338 100644 --- a/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/unary_not_basic/Forc.toml @@ -5,5 +5,4 @@ name = "unary_not_basic" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.lock b/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.lock index 88b9de82212..ed21d6e699c 100644 --- a/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'unary_not_basic_2' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] diff --git a/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.toml b/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.toml index bb6b76974a1..f2526ad2e15 100644 --- a/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/unary_not_basic_2/Forc.toml @@ -5,5 +5,4 @@ name = "unary_not_basic_2" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.lock b/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.lock index f8325bbacfd..884bf6cf336 100644 --- a/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.lock @@ -3,19 +3,11 @@ name = 'core' source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' dependencies = [] -[[package]] -name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' -dependencies = [] - [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226' +source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] [[package]] name = 'xos_opcode' -dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=v0.0.1#5a0938f8248d820ef178b6efd9c105463c543226', -] +dependencies = ['std git+http://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] diff --git a/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.toml b/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.toml index afc74d2e583..e5ac36a89ae 100644 --- a/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/xos_opcode/Forc.toml @@ -5,5 +5,4 @@ name = "xos_opcode" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", tag = "v0.0.1" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", tag = "v0.0.1" } +std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" }