Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/blockifier/src/fee/fee_checks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl FeeCheckReport {
) -> TransactionExecutionResult<()> {
let TransactionReceipt { fee, .. } = *tx_receipt;
let (balance_low, balance_high, can_pay) =
get_balance_and_if_covers_fee(state, tx_context, fee)?;
get_balance_and_if_covers_fee(state, tx_context, fee).map_err(Box::new)?;
if can_pay {
return Ok(());
}
Expand Down
2 changes: 1 addition & 1 deletion crates/blockifier/src/transaction/account_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ impl AccountTransaction {

Ok(fee_transfer_call
.execute(state, &mut context, &mut remaining_gas_for_fee_transfer)
.map_err(TransactionFeeError::ExecuteFeeTransferError)?)
.map_err(|error| Box::new(TransactionFeeError::ExecuteFeeTransferError(error)))?)
}

/// Handles fee transfer in concurrent execution.
Expand Down
2 changes: 1 addition & 1 deletion crates/blockifier/src/transaction/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pub enum TransactionExecutionError {
#[error(transparent)]
StateError(#[from] StateError),
#[error(transparent)]
TransactionFeeError(#[from] TransactionFeeError),
TransactionFeeError(#[from] Box<TransactionFeeError>),
#[error(transparent)]
TransactionPreValidationError(#[from] TransactionPreValidationError),
#[error(transparent)]
Expand Down
4 changes: 2 additions & 2 deletions crates/blockifier/src/transaction/l1_handler_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ impl<U: UpdatableState> ExecutableTransaction<U> for L1HandlerTransaction {
// For now, assert only that any amount of fee was paid.
// The error message still indicates the required fee.
if paid_fee == Fee(0) {
return Err(TransactionExecutionError::TransactionFeeError(
return Err(TransactionExecutionError::TransactionFeeError(Box::new(
TransactionFeeError::InsufficientFee {
paid_fee,
actual_fee: receipt.fee,
},
));
)));
}

Ok(l1_handler_tx_execution_info(execute_call_info, receipt, None))
Expand Down
6 changes: 4 additions & 2 deletions crates/blockifier/src/transaction/transactions_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2817,10 +2817,12 @@ fn test_l1_handler(#[values(false, true)] use_kzg_da: bool) {

assert_matches!(
error,
TransactionExecutionError::TransactionFeeError(
TransactionExecutionError::TransactionFeeError(boxed_fee_error)
if matches!(
*boxed_fee_error,
TransactionFeeError::InsufficientFee { paid_fee, actual_fee }
if paid_fee == Fee(0) && actual_fee == expected_actual_fee
)
if paid_fee == Fee(0) && actual_fee == expected_actual_fee
);
}

Expand Down
4 changes: 2 additions & 2 deletions crates/native_blockifier/src/py_testing_wrappers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use crate::py_objects::PyExecutionResources;

#[pyfunction]
pub fn raise_error_for_testing() -> NativeBlockifierResult<()> {
Err(TransactionExecutionError::TransactionFeeError(
Err(TransactionExecutionError::TransactionFeeError(Box::new(
TransactionFeeError::CairoResourcesNotContainedInFeeCosts,
)
))
.into())
}

Expand Down
Loading