Merge pull request #6655 from jacinta-stacks/merge-aac-client-breaking-into-develop

Merge aac client breaking into develop

Author: jacinta-stacks

CONTRIBUTING.md

@@ -498,10 +498,10 @@ impl<'a, 'b> ReadOnlyChecker<'a, 'b> {
     ///
     /// # Errors
     ///
-    /// - Returns CheckErrors::WriteAttemptedInReadOnly if there is a read-only
+    /// - Returns CheckErrorKind::WriteAttemptedInReadOnly if there is a read-only
     ///   violation, i.e. if some function marked read-only attempts to modify
     ///   the chainstate.
-    pub fn run(&mut self, contract_analysis: &ContractAnalysis) -> Result<(), CheckError>
+    pub fn run(&mut self, contract_analysis: &ContractAnalysis) -> Result<(), StaticCheckError>
 ```
 
 This comment is considered positive because it explains the contract of the function in pseudo-code. Someone who understands the constructs mentioned could, e.g., write a test for this method from this description.

clarity-types/src/errors/analysis.rs

@@ -31,7 +31,7 @@ pub mod representations;
 pub mod token;
 pub mod types;
 
-pub use errors::Error;
+pub use errors::VmExecutionError;
 pub use representations::{ClarityName, ContractName};
 pub use types::Value;
 

clarity-types/src/errors/ast.rs

@@ -23,7 +23,7 @@ use regex::Regex;
 use stacks_common::codec::{Error as codec_error, StacksMessageCodec, read_next, write_next};
 
 use crate::Value;
-use crate::errors::RuntimeErrorType;
+use crate::errors::RuntimeError;
 use crate::types::TraitIdentifier;
 
 pub const CONTRACT_MIN_NAME_LENGTH: usize = 1;
@@ -66,17 +66,17 @@ guarded_string!(
     "ClarityName",
     CLARITY_NAME_REGEX,
     MAX_STRING_LEN,
-    RuntimeErrorType,
-    RuntimeErrorType::BadNameValue
+    RuntimeError,
+    RuntimeError::BadNameValue
 );
 
 guarded_string!(
     ContractName,
     "ContractName",
     CONTRACT_NAME_REGEX,
     MAX_STRING_LEN,
-    RuntimeErrorType,
-    RuntimeErrorType::BadNameValue
+    RuntimeError,
+    RuntimeError::BadNameValue
 );
 
 impl StacksMessageCodec for ClarityName {
@@ -623,14 +623,14 @@ impl SymbolicExpression {
     }
 
     /// Encode this SymbolicExpression as a String suitable for logging an error (such as in
-    /// CheckErrors).  The `developer-mode` feature includes the `span`.
+    /// CheckErrorKind).  The `developer-mode` feature includes the `span`.
     #[cfg(feature = "developer-mode")]
     pub fn as_error_string(&self) -> String {
         format!("{} at {:?}", &self.expr, &self.span)
     }
 
     /// Encode this SymbolicExpression as a String suitable for logging an error (such as in
-    /// CheckErrors).
+    /// CheckErrorKind).
     #[cfg(not(feature = "developer-mode"))]
     pub fn as_error_string(&self) -> String {
         format!("{}", &self.expr)

clarity-types/src/errors/mod.rs

@@ -15,7 +15,7 @@
 
 use rstest::rstest;
 
-use crate::errors::RuntimeErrorType;
+use crate::errors::RuntimeError;
 use crate::representations::{
     CONTRACT_MAX_NAME_LENGTH, CONTRACT_MIN_NAME_LENGTH, ClarityName, ContractName, MAX_STRING_LEN,
 };
@@ -73,7 +73,7 @@ fn test_clarity_name_invalid(#[case] name: &str) {
     assert!(result.is_err());
     assert!(matches!(
         result.unwrap_err(),
-        RuntimeErrorType::BadNameValue(_, _)
+        RuntimeError::BadNameValue(_, _)
     ));
 }
 
@@ -157,7 +157,7 @@ fn test_contract_name_invalid(#[case] name: &str) {
     assert!(result.is_err());
     assert!(matches!(
         result.unwrap_err(),
-        RuntimeErrorType::BadNameValue(_, _)
+        RuntimeError::BadNameValue(_, _)
     ));
 }