added CostErrors::ExecutionTimeExpired

Author: rdeioris

clarity/src/vm/analysis/errors.rs

@@ -280,6 +280,7 @@ impl From<CostErrors> for CheckErrors {
                 CheckErrors::Expects("Unexpected interpreter failure in cost computation".into())
             }
             CostErrors::Expect(s) => CheckErrors::Expects(s),
+            CostErrors::ExecutionTimeExpired => CheckErrors::ExecutionTimeExpired,
         }
     }
 }

clarity/src/vm/ast/errors.rs

@@ -92,6 +92,8 @@ pub enum ParseErrors {
     UnexpectedParserFailure,
     /// Should be an unreachable failure which invalidates the transaction
     InterpreterFailure,
+
+    ExecutionTimeExpired,
 }
 
 #[derive(Debug, PartialEq)]
@@ -173,6 +175,7 @@ impl From<CostErrors> for ParseError {
             CostErrors::InterpreterFailure | CostErrors::Expect(_) => {
                 ParseError::new(ParseErrors::InterpreterFailure)
             }
+            CostErrors::ExecutionTimeExpired => ParseError::new(ParseErrors::ExecutionTimeExpired),
         }
     }
 }
@@ -299,6 +302,7 @@ impl DiagnosableError for ParseErrors {
             ParseErrors::NoteToMatchThis(token) => format!("to match this '{}'", token),
             ParseErrors::UnexpectedParserFailure => "unexpected failure while parsing".to_string(),
             ParseErrors::InterpreterFailure => "unexpected failure while parsing".to_string(),
+            ParseErrors::ExecutionTimeExpired => "max execution time expired".to_string(),
         }
     }
 

clarity/src/vm/contexts.rs

@@ -17,7 +17,7 @@
 use std::collections::BTreeMap;
 use std::fmt;
 use std::mem::replace;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 
 use hashbrown::{HashMap, HashSet};
 use serde::Serialize;
@@ -48,8 +48,6 @@ use crate::vm::types::{
 use crate::vm::version::ClarityVersion;
 use crate::vm::{ast, eval, is_reserved, stx_transfer_consolidated};
 
-use std::time::Duration;
-
 pub const MAX_CONTEXT_DEPTH: u16 = 256;
 
 // TODO:

clarity/src/vm/costs/mod.rs

@@ -414,6 +414,7 @@ pub enum CostErrors {
     CostContractLoadFailure,
     InterpreterFailure,
     Expect(String),
+    ExecutionTimeExpired,
 }
 
 impl CostErrors {

clarity/src/vm/mod.rs

@@ -55,6 +55,7 @@ pub mod clarity;
 
 use std::collections::BTreeMap;
 
+use costs::CostErrors;
 use serde_json;
 use stacks_common::types::StacksEpochId;
 
@@ -325,7 +326,7 @@ pub fn eval(
             exp,
             env.global_context.execution_time_tracker.elapsed()
         );
-        return Err(CheckErrors::ExecutionTimeExpired.into());
+        return Err(CostErrors::ExecutionTimeExpired.into());
     }
 
     if let Some(mut eval_hooks) = env.global_context.eval_hooks.take() {

clarity/src/vm/tests/simple_apply_eval.rs

@@ -41,7 +41,8 @@ use crate::vm::types::{
 use crate::vm::{
     eval, execute as vm_execute, execute_v2 as vm_execute_v2,
     execute_with_max_execution_time as vm_execute_with_max_execution_time, execute_with_parameters,
-    CallStack, ClarityVersion, ContractContext, Environment, GlobalContext, LocalContext, Value,
+    CallStack, ClarityVersion, ContractContext, CostErrors, Environment, GlobalContext,
+    LocalContext, Value,
 };
 
 #[test]
@@ -1773,6 +1774,6 @@ fn test_execution_time_expiration() {
         vm_execute_with_max_execution_time("(+ 1 1)", Duration::from_secs(0))
             .err()
             .unwrap(),
-        CheckErrors::ExecutionTimeExpired.into()
+        CostErrors::ExecutionTimeExpired.into()
     );
 }