From 1cef477dbc5255116972d56ad4de5af35766951b Mon Sep 17 00:00:00 2001 From: ksew1 <95349104+ksew1@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:13:59 +0100 Subject: [PATCH] Upgrade snforge and delete unnecessary Scarb.toml keys (#112) Related https://github.com/software-mansion/cairo-coverage/pull/110#discussion_r1871695182 ## Introduced changes - bump snforge in Scarb.toml and .tools-versions ## Checklist - [ ] Linked relevant issue - [ ] Updated relevant documentation - [ ] Added relevant tests - [x] Performed self-review of the code - [ ] Added changes to `CHANGELOG.md` --- .tool-versions | 2 +- .../tests/data/complex_calculator/Scarb.toml | 9 +-------- .../tests/data/coverage_ignore/Scarb.toml | 9 +-------- crates/cairo-coverage/tests/data/macros/Scarb.toml | 9 +-------- .../tests/data/readme_example/Scarb.toml | 9 +-------- .../tests/data/scarb_template/Scarb.toml | 9 +-------- crates/cairo-coverage/tests/data/simple/Scarb.toml | 9 +-------- .../tests/data/snforge_template/Scarb.toml | 10 ++-------- 8 files changed, 9 insertions(+), 57 deletions(-) diff --git a/.tool-versions b/.tool-versions index 2788889..fc75b8d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -starknet-foundry 0.30.0 +starknet-foundry 0.34.0 scarb 2.8.1 diff --git a/crates/cairo-coverage/tests/data/complex_calculator/Scarb.toml b/crates/cairo-coverage/tests/data/complex_calculator/Scarb.toml index 0b6f559..267186c 100644 --- a/crates/cairo-coverage/tests/data/complex_calculator/Scarb.toml +++ b/crates/cairo-coverage/tests/data/complex_calculator/Scarb.toml @@ -3,18 +3,11 @@ name = "complex_calculator" version = "0.1.0" edition = "2024_07" -# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] starknet = ">=2.8.0" [dev-dependencies] -snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.29.0" } - -[[target.starknet-contract]] -sierra = true - -[scripts] -test = "snforge test" +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.34.0" } [profile.dev.cairo] unstable-add-statements-functions-debug-info = true diff --git a/crates/cairo-coverage/tests/data/coverage_ignore/Scarb.toml b/crates/cairo-coverage/tests/data/coverage_ignore/Scarb.toml index 3fe61ce..0571506 100644 --- a/crates/cairo-coverage/tests/data/coverage_ignore/Scarb.toml +++ b/crates/cairo-coverage/tests/data/coverage_ignore/Scarb.toml @@ -3,18 +3,11 @@ name = "coverage_ignore" version = "0.1.0" edition = "2024_07" -# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] starknet = ">=2.8.0" [dev-dependencies] -snforge_std = "0.30.0" - -[[target.starknet-contract]] -sierra = true - -[scripts] -test = "snforge test" +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.34.0" } [profile.dev.cairo] unstable-add-statements-functions-debug-info = true diff --git a/crates/cairo-coverage/tests/data/macros/Scarb.toml b/crates/cairo-coverage/tests/data/macros/Scarb.toml index e4d079f..53cbaf3 100644 --- a/crates/cairo-coverage/tests/data/macros/Scarb.toml +++ b/crates/cairo-coverage/tests/data/macros/Scarb.toml @@ -3,18 +3,11 @@ name = "macros" version = "0.1.0" edition = "2024_07" -# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] starknet = ">=2.8.0" [dev-dependencies] -snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.29.0" } - -[[target.starknet-contract]] -sierra = true - -[scripts] -test = "snforge test" +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.34.0" } [profile.dev.cairo] unstable-add-statements-functions-debug-info = true diff --git a/crates/cairo-coverage/tests/data/readme_example/Scarb.toml b/crates/cairo-coverage/tests/data/readme_example/Scarb.toml index 21d7e28..929fe81 100644 --- a/crates/cairo-coverage/tests/data/readme_example/Scarb.toml +++ b/crates/cairo-coverage/tests/data/readme_example/Scarb.toml @@ -3,18 +3,11 @@ name = "readme_example" version = "0.1.0" edition = "2024_07" -# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] starknet = ">=2.8.0" [dev-dependencies] -snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.29.0" } - -[[target.starknet-contract]] -sierra = true - -[scripts] -test = "snforge test" +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.34.0" } [profile.dev.cairo] unstable-add-statements-functions-debug-info = true diff --git a/crates/cairo-coverage/tests/data/scarb_template/Scarb.toml b/crates/cairo-coverage/tests/data/scarb_template/Scarb.toml index 177bbb8..8f1642a 100644 --- a/crates/cairo-coverage/tests/data/scarb_template/Scarb.toml +++ b/crates/cairo-coverage/tests/data/scarb_template/Scarb.toml @@ -3,18 +3,11 @@ name = "scarb_template" version = "0.1.0" edition = "2024_07" -# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] starknet = ">=2.8.0" [dev-dependencies] -snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.29.0" } - -[[target.starknet-contract]] -sierra = true - -[scripts] -test = "snforge test" +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.34.0" } [profile.dev.cairo] unstable-add-statements-functions-debug-info = true diff --git a/crates/cairo-coverage/tests/data/simple/Scarb.toml b/crates/cairo-coverage/tests/data/simple/Scarb.toml index af29ba3..ce396e6 100644 --- a/crates/cairo-coverage/tests/data/simple/Scarb.toml +++ b/crates/cairo-coverage/tests/data/simple/Scarb.toml @@ -3,18 +3,11 @@ name = "simple" version = "0.1.0" edition = "2024_07" -# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] starknet = ">=2.8.0" [dev-dependencies] -snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.29.0" } - -[[target.starknet-contract]] -sierra = true - -[scripts] -test = "snforge test" +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.34.0" } [profile.dev.cairo] unstable-add-statements-functions-debug-info = true diff --git a/crates/cairo-coverage/tests/data/snforge_template/Scarb.toml b/crates/cairo-coverage/tests/data/snforge_template/Scarb.toml index 15652d2..9165667 100644 --- a/crates/cairo-coverage/tests/data/snforge_template/Scarb.toml +++ b/crates/cairo-coverage/tests/data/snforge_template/Scarb.toml @@ -3,21 +3,15 @@ name = "snforge_template" version = "0.1.0" edition = "2023_11" -# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html - [dependencies] -starknet = "2.8.0" +starknet = ">=2.8.0" [dev-dependencies] -snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.30.0" } +snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.34.0" } [[target.starknet-contract]] sierra = true -[scripts] -test = "snforge test" - - [profile.dev.cairo] unstable-add-statements-functions-debug-info = true unstable-add-statements-code-locations-debug-info = true