remove unused error codes

This commit is contained in:
Sergio Chouhy 2025-10-17 15:56:26 -03:00
parent b3822c4b75
commit 9e03507dd4
2 changed files with 14 additions and 24 deletions

View File

@ -23,29 +23,19 @@ pub struct SequencerCore {
} }
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
pub enum TransactionMalformationErrorKind { pub enum TransactionMalformationError {
PublicTransactionChangedPrivateData { tx: TreeHashType },
PrivateTransactionChangedPublicData { tx: TreeHashType },
TxHashAlreadyPresentInTree { tx: TreeHashType },
NullifierAlreadyPresentInTree { tx: TreeHashType },
UTXOCommitmentAlreadyPresentInTree { tx: TreeHashType },
MempoolFullForRound, MempoolFullForRound,
ChainStateFurtherThanTransactionState { tx: TreeHashType },
FailedToInsert { tx: TreeHashType, details: String },
InvalidSignature, InvalidSignature,
IncorrectSender,
BalanceMismatch { tx: TreeHashType },
NonceMismatch { tx: TreeHashType },
FailedToDecode { tx: TreeHashType }, FailedToDecode { tx: TreeHashType },
} }
impl Display for TransactionMalformationErrorKind { impl Display for TransactionMalformationError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{self:#?}") write!(f, "{self:#?}")
} }
} }
impl std::error::Error for TransactionMalformationErrorKind {} impl std::error::Error for TransactionMalformationError {}
impl SequencerCore { impl SequencerCore {
pub fn start_from_config(config: SequencerConfig) -> Self { pub fn start_from_config(config: SequencerConfig) -> Self {
@ -81,21 +71,21 @@ impl SequencerCore {
pub fn transaction_pre_check( pub fn transaction_pre_check(
&mut self, &mut self,
tx: NSSATransaction, tx: NSSATransaction,
) -> Result<NSSATransaction, TransactionMalformationErrorKind> { ) -> Result<NSSATransaction, TransactionMalformationError> {
// Stateless checks here // Stateless checks here
match tx { match tx {
NSSATransaction::Public(tx) => { NSSATransaction::Public(tx) => {
if tx.witness_set().is_valid_for(tx.message()) { if tx.witness_set().is_valid_for(tx.message()) {
Ok(NSSATransaction::Public(tx)) Ok(NSSATransaction::Public(tx))
} else { } else {
Err(TransactionMalformationErrorKind::InvalidSignature) Err(TransactionMalformationError::InvalidSignature)
} }
} }
NSSATransaction::PrivacyPreserving(tx) => { NSSATransaction::PrivacyPreserving(tx) => {
if tx.witness_set().signatures_are_valid_for(tx.message()) { if tx.witness_set().signatures_are_valid_for(tx.message()) {
Ok(NSSATransaction::PrivacyPreserving(tx)) Ok(NSSATransaction::PrivacyPreserving(tx))
} else { } else {
Err(TransactionMalformationErrorKind::InvalidSignature) Err(TransactionMalformationError::InvalidSignature)
} }
} }
} }
@ -104,16 +94,16 @@ impl SequencerCore {
pub fn push_tx_into_mempool_pre_check( pub fn push_tx_into_mempool_pre_check(
&mut self, &mut self,
transaction: EncodedTransaction, transaction: EncodedTransaction,
) -> Result<(), TransactionMalformationErrorKind> { ) -> Result<(), TransactionMalformationError> {
let transaction = NSSATransaction::try_from(&transaction).map_err(|_| { let transaction = NSSATransaction::try_from(&transaction).map_err(|_| {
TransactionMalformationErrorKind::FailedToDecode { TransactionMalformationError::FailedToDecode {
tx: transaction.hash(), tx: transaction.hash(),
} }
})?; })?;
let mempool_size = self.mempool.len(); let mempool_size = self.mempool.len();
if mempool_size >= self.sequencer_config.max_num_tx_in_block { if mempool_size >= self.sequencer_config.max_num_tx_in_block {
return Err(TransactionMalformationErrorKind::MempoolFullForRound); return Err(TransactionMalformationError::MempoolFullForRound);
} }
let authenticated_tx = self let authenticated_tx = self
@ -156,7 +146,7 @@ impl SequencerCore {
while let Some(tx) = self.mempool.pop_last() { while let Some(tx) = self.mempool.pop_last() {
let nssa_transaction = NSSATransaction::try_from(&tx) let nssa_transaction = NSSATransaction::try_from(&tx)
.map_err(|_| TransactionMalformationErrorKind::FailedToDecode { tx: tx.hash() })?; .map_err(|_| TransactionMalformationError::FailedToDecode { tx: tx.hash() })?;
if let Ok(valid_tx) = self.execute_check_transaction_on_state(nssa_transaction) { if let Ok(valid_tx) = self.execute_check_transaction_on_state(nssa_transaction) {
valid_transactions.push(valid_tx.into()); valid_transactions.push(valid_tx.into());
@ -205,7 +195,7 @@ mod tests {
fn parse_unwrap_tx_body_into_nssa_tx(tx_body: EncodedTransaction) -> NSSATransaction { fn parse_unwrap_tx_body_into_nssa_tx(tx_body: EncodedTransaction) -> NSSATransaction {
NSSATransaction::try_from(&tx_body) NSSATransaction::try_from(&tx_body)
.map_err(|_| TransactionMalformationErrorKind::FailedToDecode { tx: tx_body.hash() }) .map_err(|_| TransactionMalformationError::FailedToDecode { tx: tx_body.hash() })
.unwrap() .unwrap()
} }
@ -530,7 +520,7 @@ mod tests {
assert!(matches!( assert!(matches!(
result, result,
Err(TransactionMalformationErrorKind::MempoolFullForRound) Err(TransactionMalformationError::MempoolFullForRound)
)); ));
} }

View File

@ -1,7 +1,7 @@
use log::debug; use log::debug;
use common::rpc_primitives::errors::{RpcError, RpcParseError}; use common::rpc_primitives::errors::{RpcError, RpcParseError};
use sequencer_core::TransactionMalformationErrorKind; use sequencer_core::TransactionMalformationError;
pub struct RpcErr(pub RpcError); pub struct RpcErr(pub RpcError);
@ -41,7 +41,7 @@ impl RpcErrKind for RpcErrInternal {
} }
} }
impl RpcErrKind for TransactionMalformationErrorKind { impl RpcErrKind for TransactionMalformationError {
fn into_rpc_err(self) -> RpcError { fn into_rpc_err(self) -> RpcError {
RpcError::new_internal_error( RpcError::new_internal_error(
Some(serde_json::to_value(self).unwrap()), Some(serde_json::to_value(self).unwrap()),