Skip to content

Commit

Permalink
pin our std and core deps (FuelLabs#683)
Browse files Browse the repository at this point in the history
Co-authored-by: John Adler <[email protected]>
  • Loading branch information
sezna and adlerjohn authored Jan 23, 2022
1 parent 2e7780c commit 2877ab0
Show file tree
Hide file tree
Showing 58 changed files with 118 additions and 118 deletions.
4 changes: 2 additions & 2 deletions docs/src/getting-started/forc_project.md
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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 <[email protected]>"
[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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


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

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

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

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

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

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

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

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


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

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

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

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

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

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

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

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

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

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


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


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

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


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


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


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

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

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


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

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

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


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

[dependencies]
std = { git = "http://github.com/FuelLabs/sway-lib-std" }
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ entry = "main.sw"


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


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

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


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


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

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

0 comments on commit 2877ab0

Please sign in to comment.