Skip to content

Commit 750ccc5

Browse files
jferrantjferrant
committed
Rename clarity:src::vm::clarity::Error to ClarityError
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent 5029abf commit 750ccc5

File tree

14 files changed

+140
-133
lines changed

14 files changed

+140
-133
lines changed

‎clarity/src/vm/clarity.rs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::vm::types::{BuffData, PrincipalData, QualifiedContractIdentifier};
1414
use crate::vm::{analysis, ast, ClarityVersion, ContractContext, SymbolicExpression, Value};
1515

1616
#[derive(Debug)]
17-
pub enum Error {
17+
pub enum ClarityError {
1818
Analysis(CheckError),
1919
Parse(ParseError),
2020
Interpreter(InterpreterError),
@@ -33,85 +33,85 @@ pub enum Error {
3333
},
3434
}
3535

36-
impl fmt::Display for Error {
36+
impl fmt::Display for ClarityError {
3737
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
3838
match self {
39-
Error::CostError(ref a, ref b) => {
39+
ClarityError::CostError(ref a, ref b) => {
4040
write!(f, "Cost Error: {a} cost exceeded budget of {b} cost")
4141
}
42-
Error::Analysis(ref e) => fmt::Display::fmt(e, f),
43-
Error::Parse(ref e) => fmt::Display::fmt(e, f),
44-
Error::AbortedByCallback { reason, .. } => {
42+
ClarityError::Analysis(ref e) => fmt::Display::fmt(e, f),
43+
ClarityError::Parse(ref e) => fmt::Display::fmt(e, f),
44+
ClarityError::AbortedByCallback { reason, .. } => {
4545
write!(f, "Post condition aborted transaction: {reason}")
4646
}
47-
Error::Interpreter(ref e) => fmt::Display::fmt(e, f),
48-
Error::BadTransaction(ref s) => fmt::Display::fmt(s, f),
47+
ClarityError::Interpreter(ref e) => fmt::Display::fmt(e, f),
48+
ClarityError::BadTransaction(ref s) => fmt::Display::fmt(s, f),
4949
}
5050
}
5151
}
5252

53-
impl std::error::Error for Error {
53+
impl std::error::Error for ClarityError {
5454
fn cause(&self) -> Option<&dyn std::error::Error> {
5555
match *self {
56-
Error::CostError(ref _a, ref _b) => None,
57-
Error::AbortedByCallback { .. } => None,
58-
Error::Analysis(ref e) => Some(e),
59-
Error::Parse(ref e) => Some(e),
60-
Error::Interpreter(ref e) => Some(e),
61-
Error::BadTransaction(ref _s) => None,
56+
ClarityError::CostError(ref _a, ref _b) => None,
57+
ClarityError::AbortedByCallback { .. } => None,
58+
ClarityError::Analysis(ref e) => Some(e),
59+
ClarityError::Parse(ref e) => Some(e),
60+
ClarityError::Interpreter(ref e) => Some(e),
61+
ClarityError::BadTransaction(ref _s) => None,
6262
}
6363
}
6464
}
6565

66-
impl From<CheckError> for Error {
66+
impl From<CheckError> for ClarityError {
6767
fn from(e: CheckError) -> Self {
6868
match *e.err {
6969
CheckErrors::CostOverflow => {
70-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
70+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
7171
}
72-
CheckErrors::CostBalanceExceeded(a, b) => Error::CostError(a, b),
72+
CheckErrors::CostBalanceExceeded(a, b) => ClarityError::CostError(a, b),
7373
CheckErrors::MemoryBalanceExceeded(_a, _b) => {
74-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
74+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
7575
}
7676
CheckErrors::ExecutionTimeExpired => {
77-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
77+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
7878
}
79-
_ => Error::Analysis(e),
79+
_ => ClarityError::Analysis(e),
8080
}
8181
}
8282
}
8383

84-
impl From<InterpreterError> for Error {
84+
impl From<InterpreterError> for ClarityError {
8585
fn from(e: InterpreterError) -> Self {
8686
match &e {
8787
InterpreterError::Unchecked(CheckErrors::CostBalanceExceeded(a, b)) => {
88-
Error::CostError(a.clone(), b.clone())
88+
ClarityError::CostError(a.clone(), b.clone())
8989
}
9090
InterpreterError::Unchecked(CheckErrors::CostOverflow) => {
91-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
91+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
9292
}
9393
InterpreterError::Unchecked(CheckErrors::ExecutionTimeExpired) => {
94-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
94+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
9595
}
96-
_ => Error::Interpreter(e),
96+
_ => ClarityError::Interpreter(e),
9797
}
9898
}
9999
}
100100

101-
impl From<ParseError> for Error {
101+
impl From<ParseError> for ClarityError {
102102
fn from(e: ParseError) -> Self {
103103
match *e.err {
104104
ParseErrors::CostOverflow => {
105-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
105+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
106106
}
107-
ParseErrors::CostBalanceExceeded(a, b) => Error::CostError(a, b),
107+
ParseErrors::CostBalanceExceeded(a, b) => ClarityError::CostError(a, b),
108108
ParseErrors::MemoryBalanceExceeded(_a, _b) => {
109-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
109+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
110110
}
111111
ParseErrors::ExecutionTimeExpired => {
112-
Error::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
112+
ClarityError::CostError(ExecutionCost::max_value(), ExecutionCost::max_value())
113113
}
114-
_ => Error::Parse(e),
114+
_ => ClarityError::Parse(e),
115115
}
116116
}
117117
}
@@ -210,7 +210,7 @@ pub trait TransactionConnection: ClarityConnection {
210210
clarity_version: ClarityVersion,
211211
contract_content: &str,
212212
ast_rules: ASTRules,
213-
) -> Result<(ContractAST, ContractAnalysis), Error> {
213+
) -> Result<(ContractAST, ContractAnalysis), ClarityError> {
214214
let epoch_id = self.get_epoch();
215215

216216
self.with_analysis_db(|db, mut cost_track| {
@@ -289,12 +289,12 @@ pub trait TransactionConnection: ClarityConnection {
289289
to: &PrincipalData,
290290
amount: u128,
291291
memo: &BuffData,
292-
) -> Result<(Value, AssetMap, Vec<StacksTransactionEvent>), Error> {
292+
) -> Result<(Value, AssetMap, Vec<StacksTransactionEvent>), ClarityError> {
293293
self.with_abort_callback(
294294
|vm_env| {
295295
vm_env
296296
.stx_transfer(from, to, amount, memo)
297-
.map_err(Error::from)
297+
.map_err(ClarityError::from)
298298
},
299299
|_, _| None,
300300
)
@@ -316,7 +316,7 @@ pub trait TransactionConnection: ClarityConnection {
316316
args: &[Value],
317317
abort_call_back: F,
318318
max_execution_time: Option<std::time::Duration>,
319-
) -> Result<(Value, AssetMap, Vec<StacksTransactionEvent>), Error>
319+
) -> Result<(Value, AssetMap, Vec<StacksTransactionEvent>), ClarityError>
320320
where
321321
F: FnOnce(&AssetMap, &mut ClarityDatabase) -> Option<String>,
322322
{
@@ -340,13 +340,13 @@ pub trait TransactionConnection: ClarityConnection {
340340
public_function,
341341
&expr_args,
342342
)
343-
.map_err(Error::from)
343+
.map_err(ClarityError::from)
344344
},
345345
abort_call_back,
346346
)
347347
.and_then(|(value, assets_modified, tx_events, reason)| {
348348
if let Some(reason) = reason {
349-
Err(Error::AbortedByCallback {
349+
Err(ClarityError::AbortedByCallback {
350350
output: Some(Box::new(value)),
351351
assets_modified: Box::new(assets_modified),
352352
tx_events,
@@ -373,7 +373,7 @@ pub trait TransactionConnection: ClarityConnection {
373373
sponsor: Option<PrincipalData>,
374374
abort_call_back: F,
375375
max_execution_time: Option<std::time::Duration>,
376-
) -> Result<(AssetMap, Vec<StacksTransactionEvent>), Error>
376+
) -> Result<(AssetMap, Vec<StacksTransactionEvent>), ClarityError>
377377
where
378378
F: FnOnce(&AssetMap, &mut ClarityDatabase) -> Option<String>,
379379
{
@@ -392,12 +392,12 @@ pub trait TransactionConnection: ClarityConnection {
392392
contract_str,
393393
sponsor,
394394
)
395-
.map_err(Error::from)
395+
.map_err(ClarityError::from)
396396
},
397397
abort_call_back,
398398
)?;
399399
if let Some(reason) = reason {
400-
Err(Error::AbortedByCallback {
400+
Err(ClarityError::AbortedByCallback {
401401
output: None,
402402
assets_modified: Box::new(assets_modified),
403403
tx_events,

‎stackslib/src/chainstate/stacks/boot/contract_tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use crate::chainstate::stacks::boot::{
3131
};
3232
use crate::chainstate::stacks::index::ClarityMarfTrieId;
3333
use crate::chainstate::stacks::{C32_ADDRESS_VERSION_TESTNET_SINGLESIG, *};
34-
use crate::clarity_vm::clarity::{ClarityBlockConnection, Error as ClarityError};
34+
use crate::clarity_vm::clarity::{ClarityBlockConnection, ClarityError};
3535
use crate::clarity_vm::database::marf::{MarfedKV, WritableMarfStore};
3636
use crate::core::{
3737
StacksEpoch, StacksEpochId, BITCOIN_REGTEST_FIRST_BLOCK_HASH,

‎stackslib/src/chainstate/stacks/boot/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use std::sync::LazyLock;
2121
use clarity::types::Address;
2222
use clarity::vm::analysis::CheckErrors;
2323
use clarity::vm::ast::ASTRules;
24-
use clarity::vm::clarity::{Error as ClarityError, TransactionConnection};
24+
use clarity::vm::clarity::{ClarityError, TransactionConnection};
2525
use clarity::vm::costs::LimitedCostTracker;
2626
use clarity::vm::database::{ClarityDatabase, NULL_BURN_STATE_DB, NULL_HEADER_DB};
2727
use clarity::vm::errors::Error as VmError;

‎stackslib/src/chainstate/stacks/db/contracts.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl StacksChainState {
3232
.with_clarity_db_readonly(|ref mut db| match db.get_contract(contract_id) {
3333
Ok(c) => Ok(Some(c)),
3434
Err(clarity_vm_error::Unchecked(CheckErrors::NoSuchContract(_))) => Ok(None),
35-
Err(e) => Err(clarity_error::Interpreter(e)),
35+
Err(e) => Err(ClarityError::Interpreter(e)),
3636
})
3737
.map_err(Error::ClarityError)
3838
}
@@ -50,7 +50,7 @@ impl StacksChainState {
5050
Err(clarity_vm_error::Unchecked(CheckErrors::NoSuchDataVariable(_))) => {
5151
Ok(None)
5252
}
53-
Err(e) => Err(clarity_error::Interpreter(e)),
53+
Err(e) => Err(ClarityError::Interpreter(e)),
5454
}
5555
})
5656
.map_err(Error::ClarityError)

‎stackslib/src/chainstate/stacks/db/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ use crate::chainstate::stacks::{
6666
C32_ADDRESS_VERSION_TESTNET_SINGLESIG, *,
6767
};
6868
use crate::clarity_vm::clarity::{
69-
ClarityBlockConnection, ClarityConnection, ClarityInstance, ClarityReadOnlyConnection,
70-
Error as clarity_error, PreCommitClarityBlock,
69+
ClarityBlockConnection, ClarityConnection, ClarityError, ClarityInstance,
70+
ClarityReadOnlyConnection, PreCommitClarityBlock,
7171
};
7272
use crate::clarity_vm::database::marf::MarfedKV;
7373
use crate::clarity_vm::database::HeadersDBConn;
@@ -545,7 +545,7 @@ impl<'a, 'b> ClarityTx<'a, 'b> {
545545
pub fn commit_mined_block(
546546
self,
547547
block_hash: &StacksBlockId,
548-
) -> Result<ExecutionCost, clarity_error> {
548+
) -> Result<ExecutionCost, ClarityError> {
549549
Ok(self.block.commit_mined_block(block_hash)?.get_total())
550550
}
551551

@@ -1977,7 +1977,7 @@ impl StacksChainState {
19771977
parent_id_bhh: &StacksBlockId,
19781978
contract: &QualifiedContractIdentifier,
19791979
code: &str,
1980-
) -> Result<Value, clarity_error> {
1980+
) -> Result<Value, ClarityError> {
19811981
self.clarity_state.eval_read_only(
19821982
parent_id_bhh,
19831983
&HeadersDBConn(StacksDBConn::new(&self.state_index, ())),
@@ -1998,7 +1998,7 @@ impl StacksChainState {
19981998
contract: &QualifiedContractIdentifier,
19991999
function: &str,
20002000
args: &[Value],
2001-
) -> Result<Value, clarity_error> {
2001+
) -> Result<Value, ClarityError> {
20022002
let headers_db = HeadersDBConn(StacksDBConn::new(&self.state_index, ()));
20032003
let mut conn = self.clarity_state.read_only_connection_checked(
20042004
parent_id_bhh,

0 commit comments

Comments
 (0)