fix: remove too restrictive cargo metadata check

near · May 10, 2024 · 787c3a4 · 787c3a4
1 parent fcbf746
commit 787c3a4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 66 deletions.
diff --git a/cargo-near/src/commands/abi_command/abi.rs b/cargo-near/src/commands/abi_command/abi.rs
@@ -63,28 +63,17 @@ pub(crate) fn generate_abi(
 
     for required_feature in ["__abi-generate", "__abi-embed"] {
         if !near_sdk_dep.features.contains_key(required_feature) {
-            color_eyre::eyre::bail!("unsupported `near-sdk` version. expected 4.1.* or higher");
+            color_eyre::eyre::bail!(
+                "{}: {}",
+                format!(
+                    "missing `{}` required feature for `near-sdk` dependency",
+                    required_feature
+                ),
+                "probably unsupported `near-sdk` version. expected 4.1.* or higher"
+            );
         }
     }
 
-    let near_sdk_metadata = crate_metadata
-        .root_package
-        .dependencies
-        .iter()
-        .find(|dep| dep.name == "near-sdk")
-        .wrap_err("`near-sdk` dependency not found")?;
-
-    // `Dependency::features` return value does not contain default features, so we have to check
-    // for default features separately.
-    if !near_sdk_metadata.uses_default_features
-        && !near_sdk_metadata
-            .features
-            .iter()
-            .any(|feature| feature == "abi")
-    {
-        color_eyre::eyre::bail!("`near-sdk` dependency must have the `abi` feature enabled")
-    }
-
     let cargo_args = {
         let mut args = vec!["--features", "near-sdk/__abi-generate"];
         args.extend_from_slice(cargo_feature_args);

diff --git a/integration-tests/templates/negative/_Cargo_no_abi_feature.toml b/integration-tests/templates/negative/_Cargo_no_abi_feature.toml
diff --git a/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml b/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml
@@ -8,8 +8,8 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # NOTE: uncomment line 11 and comment 12, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { default-features = false, features = ["abi"], ::sdk-cratesio-version-toml:: }
-near-sdk = { default-features = false, features = ["abi"], ::sdk-git-version-toml:: }
+# near-sdk = { default-features = false, ::sdk-cratesio-version-toml:: }
+near-sdk = { default-features = false, ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
 
 [workspace]

diff --git a/integration-tests/tests/abi/negative.rs b/integration-tests/tests/abi/negative.rs
@@ -1,26 +1,6 @@
 use cargo_near_integration_tests::{generate_abi_fn, generate_abi_fn_with};
 use function_name::named;
 
-#[test]
-#[named]
-fn test_abi_feature_not_enabled() -> cargo_near::CliResult {
-    fn run_test() -> cargo_near::CliResult {
-        generate_abi_fn_with! {
-            Cargo: "/templates/negative/_Cargo_no_abi_feature.toml";
-            Code:
-            pub fn foo(&self, a: u32, b: u32) {}
-        };
-        Ok(())
-    }
-
-    assert_eq!(
-        run_test().map_err(|e| e.to_string()),
-        Err("`near-sdk` dependency must have the `abi` feature enabled".to_string())
-    );
-
-    Ok(())
-}
-
 #[test]
 #[named]
 fn test_abi_old_sdk() -> cargo_near::CliResult {
@@ -35,7 +15,7 @@ fn test_abi_old_sdk() -> cargo_near::CliResult {
 
     assert_eq!(
         run_test().map_err(|e| e.to_string()),
-        Err("unsupported `near-sdk` version. expected 4.1.* or higher".to_string())
+        Err("missing `__abi-generate` required feature for `near-sdk` dependency: probably unsupported `near-sdk` version. expected 4.1.* or higher".to_string())
     );
 
     Ok(())