Require explicit dependence on cairo_test (i.e. test_plugin)"

commit-id:83a53c59

examples/dependencies/Scarb.toml

@@ -6,3 +6,6 @@ version = "0.1.0"
 
 [dependencies]
 alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git" }
+
+[dev-dependencies]
+cairo_test = "2.6.0"

examples/hello_world/Scarb.toml

@@ -6,3 +6,6 @@ edition = "2023_10"
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 
 [dependencies]
+
+[dev-dependencies]
+cairo_test = "2.6.0"

examples/starknet_hello_world/Scarb.toml

@@ -7,4 +7,7 @@ version = "0.1.0"
 [dependencies]
 starknet = "2.6.0"
 
+[dev-dependencies]
+cairo_test = "2.6.0"
+
 [[target.starknet-contract]]

examples/starknet_multiple_contracts/Scarb.toml

@@ -7,4 +7,7 @@ version = "0.1.0"
 [dependencies]
 starknet = "2.6.0"
 
+[dev-dependencies]
+cairo_test = "2.6.0"
+
 [[target.starknet-contract]]

examples/workspaces/Scarb.toml

@@ -10,6 +10,7 @@ test = "snforge"
 exit_first = true
 
 [workspace.dependencies]
+cairo_test = "2.6.0"
 starknet = "2.6.0"
 
 [workspace.package]
@@ -30,4 +31,7 @@ starknet.workspace = true
 fibonacci = { path = "crates/fibonacci" }
 addition = { path = "crates/addition" }
 
+[dev-dependencies]
+cairo_test.workspace = true
+
 [[target.starknet-contract]]

examples/workspaces/crates/addition/Scarb.toml

@@ -3,3 +3,6 @@ name = "addition"
 version.workspace = true
 
 [lib]
+
+[dev-dependencies]
+cairo_test.workspace = true

examples/workspaces/crates/fibonacci/Scarb.toml

@@ -10,3 +10,6 @@ snforge.workspace = true
 
 [dependencies]
 addition = { path = "../addition" }
+
+[dev-dependencies]
+cairo_test.workspace = true

extensions/scarb-cairo-test/tests/build.rs

@@ -33,6 +33,7 @@ fn can_test_without_gas() {
                 }
             }
         "#})
+        .dep_cairo_test()
         .manifest_extra(indoc! {r#"
             [cairo]
             enable-gas = false
@@ -86,6 +87,7 @@ fn can_print_test_resources() {
                 }
             }
         "#})
+        .dep_cairo_test()
         .build(&t);
     Scarb::quick_snapbox()
         .arg("cairo-test")
@@ -130,6 +132,7 @@ fn get_features_test_build(t: &TempDir) {
                 }
             }
         "#})
+        .dep_cairo_test()
         .build(t);
 }
 
@@ -219,6 +222,7 @@ fn integration_tests() {
 
             {test_case}
         "#})
+        .dep_cairo_test()
         .src("tests/a.cairo", test_case)
         .src("tests/b.cairo", test_case)
         .build(&t);

scarb/src/core/manifest/summary.rs

@@ -8,8 +8,7 @@ use typed_builder::TypedBuilder;
 #[cfg(doc)]
 use crate::core::Manifest;
 use crate::core::{
-    Checksum, DepKind, DependencyVersionReq, ManifestDependency, PackageId, PackageName, SourceId,
-    TargetKind,
+    Checksum, DepKind, DependencyVersionReq, ManifestDependency, PackageId, PackageName, TargetKind,
 };
 
 /// Subset of a [`Manifest`] that contains only the most important information about a package.
@@ -79,27 +78,10 @@ impl Summary {
                 .version_req(DependencyVersionReq::exact(&cairo_version))
                 .build()
         });
-
-        static TEST_PLUGIN_DEPENDENCY: Lazy<ManifestDependency> = Lazy::new(|| {
-            // NOTE: Pin test plugin to exact version, because we know that's the only one we have.
-            let cairo_version = crate::version::get().cairo.version.parse().unwrap();
-            ManifestDependency::builder()
-                .kind(DepKind::Target(TargetKind::TEST))
-                .name(PackageName::TEST_PLUGIN)
-                .source_id(SourceId::default())
-                .version_req(DependencyVersionReq::exact(&cairo_version))
-                .build()
-        });
-
         let mut deps: Vec<&ManifestDependency> = Vec::new();
-
         if !self.no_core {
             deps.push(&CORE_DEPENDENCY);
         }
-        if self.target_kinds.contains(&TargetKind::TEST) {
-            deps.push(&TEST_PLUGIN_DEPENDENCY);
-        }
-
         deps.into_iter()
     }
 

scarb/tests/build_targets.rs

@@ -309,6 +309,7 @@ fn compile_test_target() {
     let t = TempDir::new().unwrap();
     ProjectBuilder::start()
         .name("hello")
+        .dep_cairo_test()
         .lib_cairo(r#"fn f() -> felt252 { 42 }"#)
         .build(&t);
     t.child("tests").create_dir_all().unwrap();
@@ -365,6 +366,7 @@ fn integration_tests_do_not_enable_cfg_in_main_package() {
     let t = TempDir::new().unwrap();
     ProjectBuilder::start()
         .name("hello")
+        .dep_cairo_test()
         .lib_cairo(indoc! {r#"
             #[cfg(test)]
             fn f() -> felt252 { 42 }

scarb/tests/expand.rs

@@ -56,6 +56,7 @@ fn expand_integration_test() {
     "#};
     ProjectBuilder::start()
         .name("hello")
+        .dep_cairo_test()
         .lib_cairo(formatdoc! {r#"
             fn fib(mut n: u32) -> u32 {{
                 let mut a: u32 = 0;
@@ -112,6 +113,7 @@ fn can_select_target_by_kind() {
     let t = TempDir::new().unwrap();
     ProjectBuilder::start()
         .name("hello")
+        .dep_cairo_test()
         .lib_cairo(indoc! {r#"
             fn hello() -> felt252 {
                 42
@@ -179,6 +181,7 @@ fn can_expand_multiple_targets() {
     "#};
     ProjectBuilder::start()
         .name("hello")
+        .dep_cairo_test()
         .lib_cairo(formatdoc! {r#"
             fn fib(mut n: u32) -> u32 {{
                 let mut a: u32 = 0;

scarb/tests/git_source.rs

@@ -423,10 +423,12 @@ fn transitive_path_dep() {
     let git_dep = gitx::new("dep1", |t| {
         ProjectBuilder::start()
             .name("dep0")
+            .dep_cairo_test()
             .lib_cairo("fn hello() -> felt252 { 42 }")
             .build(&t.child("zero"));
         ProjectBuilder::start()
             .name("dep1")
+            .dep_cairo_test()
             .lib_cairo("fn hello() -> felt252 { dep0::hello() }")
             .dep("dep0", Dep.path("../zero"))
             .build(&t.child("one"));
@@ -436,6 +438,7 @@ fn transitive_path_dep() {
     ProjectBuilder::start()
         .name("hello")
         .version("1.0.0")
+        .dep_cairo_test()
         .dep("dep0", &git_dep)
         .dep("dep1", &git_dep)
         .lib_cairo("fn world() -> felt252 { dep1::hello() }")