Get features from all targets

.github/workflows/ci.yml

@@ -119,6 +119,7 @@ jobs:
  - uses: software-mansion/setup-universal-sierra-compiler@v1
  - run: |
  cargo test --package forge --features scarb_2_8_3 e2e::contract_artifacts
+ cargo test --package forge --features scarb_2_8_3 e2e::features
  cargo test --package scarb-api --features scarb_2_8_3 get_starknet_artifacts_path
 
  test-forge-runner:

crates/cheatnet/tests/common/mod.rs

@@ -26,7 +26,9 @@ use conversions::string::TryFromHexStr;
 use conversions::IntoConv;
 use runtime::starknet::context::build_context;
 use scarb_api::metadata::MetadataCommandExt;
-use scarb_api::{get_contracts_artifacts_and_source_sierra_paths, ScarbCommand};
+use scarb_api::{
+ get_contracts_artifacts_and_source_sierra_paths, target_dir_for_workspace, ScarbCommand,
+};
 use starknet::core::utils::get_selector_from_name;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::deprecated_contract_class::EntryPointType;
@@ -72,12 +74,12 @@ pub fn get_contracts() -> ContractsData {
  .manifest_path("tests/contracts/Scarb.toml")
  .run()
  .unwrap();
+ let target_dir = target_dir_for_workspace(&scarb_metadata).join("dev");
 
  let package = scarb_metadata.packages.first().unwrap();
 
  let contracts =
- get_contracts_artifacts_and_source_sierra_paths(&scarb_metadata, &package.id, None, false)
- .unwrap();
+ get_contracts_artifacts_and_source_sierra_paths(&target_dir, package, false).unwrap();
  ContractsData::try_from(contracts).unwrap()
 }
 

crates/forge/src/run_tests/package.rs

@@ -53,9 +53,8 @@ impl RunForPackageArgs {
  let raw_test_targets = load_test_artifacts(snforge_target_dir_path, &package)?;
 
  let contracts = get_contracts_artifacts_and_source_sierra_paths(
- scarb_metadata,
- &package.id,
- None,
+ snforge_target_dir_path,
+ &package,
  !should_compile_starknet_contract_target(
  &scarb_metadata.app_version_info.version,
  args.no_optimization,

crates/forge/src/scarb.rs

@@ -5,11 +5,10 @@ use camino::Utf8Path;
 use configuration::PackageConfig;
 use forge_runner::package_tests::raw::TestTargetRaw;
 use forge_runner::package_tests::TestTargetLocation;
-use scarb_api::ScarbCommand;
-use scarb_metadata::{PackageMetadata, TargetMetadata};
+use scarb_api::{test_targets_by_name, ScarbCommand};
+use scarb_metadata::PackageMetadata;
 use scarb_ui::args::{FeaturesSpec, PackagesFilter};
 use semver::Version;
-use std::collections::HashMap;
 use std::fs::read_to_string;
 use std::io::ErrorKind;
 
@@ -76,27 +75,6 @@ fn build_test_artifacts_with_scarb(filter: PackagesFilter, features: FeaturesSpe
  Ok(())
 }
 
-/// collecting by name allow us to dedup targets
-/// we do it because they use same sierra and we display them without distinction anyway
-fn test_targets_by_name(package: &PackageMetadata) -> HashMap<String, &TargetMetadata> {
- fn test_target_name(target: &TargetMetadata) -> String {
- // this is logic copied from scarb: https://github.com/software-mansion/scarb/blob/90ab01cb6deee48210affc2ec1dc94d540ab4aea/extensions/scarb-cairo-test/src/main.rs#L115
- target
- .params
- .get("group-id") // by unit tests grouping
- .and_then(|v| v.as_str())
- .map(ToString::to_string)
- .unwrap_or(target.name.clone()) // else by integration test name
- }
-
- package
- .targets
- .iter()
- .filter(|target| target.kind == "test")
- .map(|target| (test_target_name(target), target))
- .collect()
-}
-
 pub fn load_test_artifacts(
  target_dir: &Utf8Path,
  package: &PackageMetadata,

crates/forge/test_utils/src/runner.rs

@@ -13,8 +13,8 @@ use forge_runner::{
 };
 use indoc::formatdoc;
 use scarb_api::{
- get_contracts_artifacts_and_source_sierra_paths, metadata::MetadataCommandExt, ScarbCommand,
- StarknetContractArtifacts,
+ get_contracts_artifacts_and_source_sierra_paths, metadata::MetadataCommandExt,
+ target_dir_for_workspace, ScarbCommand, StarknetContractArtifacts,
 };
 use shared::command::CommandExt;
 use std::{
@@ -96,17 +96,13 @@ impl Contract {
  .iter()
  .find(|package| package.name == "contract")
  .unwrap();
+ let target_dir = target_dir_for_workspace(&scarb_metadata).join("dev");
 
- let contract = get_contracts_artifacts_and_source_sierra_paths(
- &scarb_metadata,
- &package.id,
- None,
- false,
- )
- .unwrap()
- .remove(&self.name)
- .ok_or(anyhow!("there is no contract with name {}", self.name))?
- .0;
+ let contract = get_contracts_artifacts_and_source_sierra_paths(&target_dir, package, false)
+ .unwrap()
+ .remove(&self.name)
+ .ok_or(anyhow!("there is no contract with name {}", self.name))?
+ .0;
 
  Ok((contract.sierra, contract.casm))
  }

crates/forge/tests/data/hello_workspaces/Scarb.toml

@@ -30,5 +30,8 @@ starknet.workspace = true
 fibonacci = { path = "crates/fibonacci" }
 addition = { path = "crates/addition" }
 
+[dev-dependencies]
+snforge_std.workspace = true
+
 [[target.starknet-contract]]
 sierra = true

crates/forge/tests/data/targets/custom_target/Scarb.toml

@@ -0,0 +1,25 @@
+[package]
+name = "custom_target"
+version = "0.1.0"
+
+[dependencies]
+starknet = "2.7.0"
+
+[dev-dependencies]
+snforge_std = { path = "../../../../../../snforge_std" }
+
+[[target.starknet-contract]]
+
+[[test]]
+name = "custom_target_integrationtest"
+kind = "test"
+source-path = "./tests/tests.cairo"
+test-type = "integration"
+
+[[test]]
+name = "custom_target_unittest"
+kind = "test"
+test-type = "unit"
+
+[tool.snforge]
+exit_first = false

crates/forge/tests/data/targets/custom_target/src/lib.cairo

@@ -0,0 +1,55 @@
+#[starknet::interface]
+trait IHelloStarknet<TContractState> {
+ fn increase_balance(ref self: TContractState, amount: felt252);
+ fn get_balance(self: @TContractState) -> felt252;
+ fn do_a_panic(self: @TContractState);
+ fn do_a_panic_with(self: @TContractState, panic_data: Array<felt252>);
+}
+
+#[starknet::contract]
+mod HelloStarknet {
+ use array::ArrayTrait;
+
+ #[storage]
+ struct Storage {
+ balance: felt252,
+ }
+
+ #[abi(embed_v0)]
+ impl IHelloStarknetImpl of super::IHelloStarknet<ContractState> {
+ // Increases the balance by the given amount.
+ fn increase_balance(ref self: ContractState, amount: felt252) {
+ self.balance.write(self.balance.read() + amount);
+ }
+
+ // Returns the current balance.
+ fn get_balance(self: @ContractState) -> felt252 {
+ self.balance.read()
+ }
+
+ // Panics
+ fn do_a_panic(self: @ContractState) {
+ let mut arr = ArrayTrait::new();
+ arr.append('PANIC');
+ arr.append('DAYTAH');
+ panic(arr);
+ }
+
+ // Panics with given array data
+ fn do_a_panic_with(self: @ContractState, panic_data: Array<felt252>) {
+ panic(panic_data);
+ }
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use snforge_std::{declare, ContractClassTrait};
+ use snforge_std::cheatcodes::contract_class::DeclareResultTrait;
+
+ #[test]
+ fn declare_contract_from_lib() {
+ let _ = declare("HelloStarknet").unwrap().contract_class();
+ assert(2 == 2, 'Should declare');
+ }
+}

crates/forge/tests/data/targets/custom_target/tests/tests.cairo

@@ -0,0 +1,28 @@
+use array::ArrayTrait;
+use result::ResultTrait;
+use option::OptionTrait;
+use traits::TryInto;
+use starknet::ContractAddress;
+use starknet::Felt252TryIntoContractAddress;
+
+use snforge_std::{declare, ContractClassTrait};
+use snforge_std::cheatcodes::contract_class::DeclareResultTrait;
+
+use custom_target::IHelloStarknetDispatcher;
+use custom_target::IHelloStarknetDispatcherTrait;
+
+#[test]
+fn declare_and_call_contract_from_lib() {
+ let contract = declare("HelloStarknet").unwrap().contract_class();
+ let constructor_calldata = @ArrayTrait::new();
+ let (contract_address, _) = contract.deploy(constructor_calldata).unwrap();
+ let dispatcher = IHelloStarknetDispatcher { contract_address };
+
+ let balance = dispatcher.get_balance();
+ assert(balance == 0, 'balance == 0');
+
+ dispatcher.increase_balance(100);
+
+ let balance = dispatcher.get_balance();
+ assert(balance == 100, 'balance == 100');
+}

crates/forge/tests/data/targets/custom_target_custom_names/Scarb.toml

@@ -0,0 +1,25 @@
+[package]
+name = "custom_target_custom_names"
+version = "0.1.0"
+
+[dependencies]
+starknet = "2.7.0"
+
+[dev-dependencies]
+snforge_std = { path = "../../../../../../snforge_std" }
+
+
+[[test]]
+name = "custom_first"
+kind = "my_kind"
+source-path = "./tests/tests.cairo"
+test-type = "integration"
+build-external-contracts = ["custom_target_custom_names::*"]
+
+[[test]]
+name = "custom_second"
+kind = "my_other_kind"
+test-type = "unit"
+
+[tool.snforge]
+exit_first = false

crates/forge/tests/data/targets/custom_target_custom_names/src/lib.cairo

@@ -0,0 +1,55 @@
+#[starknet::interface]
+trait IHelloStarknet<TContractState> {
+ fn increase_balance(ref self: TContractState, amount: felt252);
+ fn get_balance(self: @TContractState) -> felt252;
+ fn do_a_panic(self: @TContractState);
+ fn do_a_panic_with(self: @TContractState, panic_data: Array<felt252>);
+}
+
+#[starknet::contract]
+mod HelloStarknet {
+ use array::ArrayTrait;
+
+ #[storage]
+ struct Storage {
+ balance: felt252,
+ }
+
+ #[abi(embed_v0)]
+ impl IHelloStarknetImpl of super::IHelloStarknet<ContractState> {
+ // Increases the balance by the given amount.
+ fn increase_balance(ref self: ContractState, amount: felt252) {
+ self.balance.write(self.balance.read() + amount);
+ }
+
+ // Returns the current balance.
+ fn get_balance(self: @ContractState) -> felt252 {
+ self.balance.read()
+ }
+
+ // Panics
+ fn do_a_panic(self: @ContractState) {
+ let mut arr = ArrayTrait::new();
+ arr.append('PANIC');
+ arr.append('DAYTAH');
+ panic(arr);
+ }
+
+ // Panics with given array data
+ fn do_a_panic_with(self: @ContractState, panic_data: Array<felt252>) {
+ panic(panic_data);
+ }
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use snforge_std::{declare, ContractClassTrait};
+ use snforge_std::cheatcodes::contract_class::DeclareResultTrait;
+
+ #[test]
+ fn declare_contract_from_lib() {
+ let _ = declare("HelloStarknet").unwrap().contract_class();
+ assert(2 == 2, 'Should declare');
+ }
+}

crates/forge/tests/data/targets/custom_target_custom_names/tests/tests.cairo

@@ -0,0 +1,28 @@
+use array::ArrayTrait;
+use result::ResultTrait;
+use option::OptionTrait;
+use traits::TryInto;
+use starknet::ContractAddress;
+use starknet::Felt252TryIntoContractAddress;
+
+use snforge_std::{declare, ContractClassTrait};
+use snforge_std::cheatcodes::contract_class::DeclareResultTrait;
+
+use custom_target_custom_names::IHelloStarknetDispatcher;
+use custom_target_custom_names::IHelloStarknetDispatcherTrait;
+
+#[test]
+fn declare_and_call_contract_from_lib() {
+ let contract = declare("HelloStarknet").unwrap().contract_class();
+ let constructor_calldata = @ArrayTrait::new();
+ let (contract_address, _) = contract.deploy(constructor_calldata).unwrap();
+ let dispatcher = IHelloStarknetDispatcher { contract_address };
+
+ let balance = dispatcher.get_balance();
+ assert(balance == 0, 'balance == 0');
+
+ dispatcher.increase_balance(100);
+
+ let balance = dispatcher.get_balance();
+ assert(balance == 100, 'balance == 100');
+}

crates/forge/tests/data/targets/custom_target_only_integration/Scarb.toml

@@ -0,0 +1,21 @@
+[package]
+name = "custom_target_only_integration"
+version = "0.1.0"
+
+[dependencies]
+starknet = "2.7.0"
+
+[dev-dependencies]
+snforge_std = { path = "../../../../../../snforge_std" }
+
+[[target.starknet-contract]]
+
+[[test]]
+name = "custom_first"
+kind = "test"
+source-path = "./tests/tests.cairo"
+test-type = "integration"
+build-external-contracts = ["custom_target_only_integration::*"]
+
+[tool.snforge]
+exit_first = false