Merge pull request #6689 from jacinta-stacks/chore/fix-clarity-error-string

Fix error string when converting string to ClarityVersion

Author: jacinta-stacks

clarity/src/vm/version.rs

@@ -3,8 +3,6 @@ use std::str::FromStr;
 
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::errors::{RuntimeError, VmExecutionError};
-
 #[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, PartialOrd)]
 pub enum ClarityVersion {
     Clarity1,
@@ -58,9 +56,9 @@ impl ClarityVersion {
 }
 
 impl FromStr for ClarityVersion {
-    type Err = VmExecutionError;
+    type Err = &'static str;
 
-    fn from_str(version: &str) -> Result<ClarityVersion, VmExecutionError> {
+    fn from_str(version: &str) -> Result<ClarityVersion, &'static str> {
         let s = version.to_string().to_lowercase();
         if s == "clarity1" {
             Ok(ClarityVersion::Clarity1)
@@ -71,11 +69,7 @@ impl FromStr for ClarityVersion {
         } else if s == "clarity4" {
             Ok(ClarityVersion::Clarity4)
         } else {
-            Err(RuntimeError::TypeParseFailure(
-                "Invalid clarity version. Valid versions are: Clarity1, Clarity2, Clarity3."
-                    .to_string(),
-            )
-            .into())
+            Err("Invalid clarity version. Valid versions are: Clarity1, Clarity2, Clarity3, Clarity4.")
         }
     }
 }

stackslib/src/clarity_cli.rs

@@ -1030,7 +1030,7 @@ fn parse_clarity_version_flag(argv: &mut Vec<String>, epoch: StacksEpochId) -> C
         if let Some(s) = optarg {
             friendly_expect(
                 s.parse::<ClarityVersion>(),
-                &format!("Invalid clarity version: {}", s),
+                &format!("Invalid clarity version: {s}"),
             )
         } else {
             ClarityVersion::default_for_epoch(epoch)