Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Pin our std and core deps in the test suite #683

Merged
merged 2 commits into from Jan 23, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/src/getting-started/forc_project.md
Expand Up @@ -29,8 +29,8 @@ entry = "main.sw"
license = "Apache-2.0"

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

Here are the contents of the only Sway file in the project, and the main entry point, `src/main.sw`:
Expand Down
4 changes: 2 additions & 2 deletions docs/src/getting-started/temporary_workarounds.md
Expand Up @@ -6,8 +6,8 @@ The standard library is currently not distributed with `forc` if [installed via

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

Note that the default `Forc.toml` generated with `forc init` already includes these lines, so no further action is necessary.
Expand Down
16 changes: 8 additions & 8 deletions forc/src/ops/forc_fmt.rs
Expand Up @@ -196,8 +196,8 @@ name = "Fuel example project"


[dependencies]
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
"#;
let taplo_alphabetize = taplo_fmt::Options {
reorder_keys: true,
Expand All @@ -213,8 +213,8 @@ std = { git = "http://github.com/FuelLabs/sway-lib-std" }


[dependencies]
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
"#;
let formatted_content =
taplo_fmt::format(indented_forc_manifest, taplo_alphabetize.clone());
Expand Down Expand Up @@ -244,8 +244,8 @@ name = "Fuel example project"


[dependencies]
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core", version = "v0.0.1" }
std = { git = "http://github.com/FuelLabs/sway-lib-std", version = "v0.0.1" }
"#;
let taplo_alphabetize = taplo_fmt::Options {
reorder_keys: true,
Expand All @@ -261,8 +261,8 @@ author = "Fuel Labs <contact@fuel.sh>"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
"#;
let formatted_content = taplo_fmt::format(disordered_forc_manifest, taplo_alphabetize);
assert_eq!(formatted_content, correct_forc_manifest);
Expand Down
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/address_test/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "address_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/array_basics/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "array_basics"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/assert_test/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "assert_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
Expand Up @@ -5,6 +5,6 @@ name = "auth_testing_contract"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
auth_testing_abi = { path = "../auth_testing_abi" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "b256_bad_jumps"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "b256_ops"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
Expand Up @@ -5,6 +5,6 @@ name = "b512_panic_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }

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

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml
Expand Up @@ -5,8 +5,8 @@ name = "bal_opcode"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
balance_test_abi = { path = "../balance_test_abi"}

[[tx-input]]
Expand Down
Expand Up @@ -5,5 +5,5 @@ name = "balance_test_contract"
entry = "main.sw"

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


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml
Expand Up @@ -5,6 +5,6 @@ name = "basic_storage"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
basic_storage_abi = { path = "../basic_storage_abi" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/block_height/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "block_height"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
Expand Up @@ -5,8 +5,8 @@ name = "call_increment_contract"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
increment_abi = { path = "../increment_abi" }

[[tx-input]]
Expand Down
Expand Up @@ -5,8 +5,8 @@ name = "caller_auth_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
auth_testing_abi = { path = "../auth_testing_abi" }

[[tx-input]]
Expand Down
Expand Up @@ -5,8 +5,8 @@ name = "caller_context_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
context_testing_abi = { path = "../context_testing_abi" }

[[tx-input]]
Expand Down
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "const_decl"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
Expand Up @@ -5,5 +5,5 @@ name = "const_decl_in_library"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
Expand Up @@ -5,4 +5,4 @@ name = "context_testing_abi"
entry = "main.sw"

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

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


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml
Expand Up @@ -6,8 +6,8 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }

[[tx-input]]
type = "Contract"
Expand Down
Expand Up @@ -5,5 +5,5 @@ name = "contract_id_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


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

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

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/enum_in_fn_decl/Forc.toml
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/eq_4_test/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "eq_4_test"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
Expand Up @@ -5,5 +5,5 @@ name = "excess_fn_arguments"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/fix_opcode_bug/Forc.toml
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/generic_enum/Forc.toml
Expand Up @@ -5,5 +5,5 @@ name = "generic_enum"
entry = "main.sw"

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/if_elseif_enum/Forc.toml
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }


Expand Up @@ -6,5 +6,5 @@ entry = "main.sw"

[dependencies]
increment_abi = { path = "../increment_abi" }
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
core = { git = "http://github.com/FuelLabs/sway-lib-core" }
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" }