refactor: rename errors to NonPayingNotAllowed

Author: JuArce

batcher/aligned-batcher/src/lib.rs

@@ -642,7 +642,7 @@ impl Batcher {
                 error!("Failed to generate non paying data");
                 send_message(
                     ws_conn_sink.clone(),
-                    SubmitProofResponseMessage::NonPayingAddressError,
+                    SubmitProofResponseMessage::NonPayingNotAllowed,
                 )
                 .await;
                 return Ok(());
@@ -1774,7 +1774,7 @@ impl Batcher {
         info!("Handling nonpaying message");
         let Some(non_paying_config) = self.non_paying_config.as_ref() else {
             warn!("There isn't a non-paying configuration loaded. This message will be ignored");
-            return Err(TransactionSendError::NonPayingAddressNotAllowed);
+            return Err(TransactionSendError::NonPayingNotAllowed);
         };
 
         let nonced_verification_data = NoncedVerificationData::new(
@@ -1785,7 +1785,8 @@ impl Batcher {
             self.payment_service.address(),
         );
 
-        let client_msg = SubmitProofMessage::new(
+        // We need to sign a message with the non-paying replacement address
+        let non_paying_replacement_msg = SubmitProofMessage::new(
             client_msg.verification_data.clone(),
             non_paying_config.replacement.clone(),
         )
@@ -1795,7 +1796,7 @@ impl Batcher {
         Ok(NonPayingData {
             address: non_paying_config.replacement.address(),
             nonced_verification_data,
-            signature: client_msg.signature,
+            signature: non_paying_replacement_msg.signature,
         })
     }
 

batcher/aligned-batcher/src/types/errors.rs

@@ -11,7 +11,7 @@ pub enum TransactionSendError {
     BatchAlreadySubmitted,
     InsufficientFunds,
     OnlyBatcherAllowed,
-    NonPayingAddressNotAllowed,
+    NonPayingNotAllowed,
     Generic(String),
 }
 
@@ -171,8 +171,8 @@ impl fmt::Display for TransactionSendError {
             TransactionSendError::Generic(e) => {
                 write!(f, "Generic error: {}", e)
             }
-            TransactionSendError::NonPayingAddressNotAllowed => {
-                write!(f, "Non-paying address not allowed")
+            TransactionSendError::NonPayingNotAllowed => {
+                write!(f, "Non-paying not allowed")
             }
         }
     }

batcher/aligned-sdk/src/common/types.rs

@@ -399,7 +399,7 @@ pub enum SubmitProofResponseMessage {
     EthRpcError,
     InvalidPaymentServiceAddress(Address, Address),
     UnderpricedProof,
-    NonPayingAddressError,
+    NonPayingNotAllowed,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

batcher/aligned-sdk/src/communication/messaging.rs

@@ -276,8 +276,8 @@ async fn handle_batcher_response(msg: Message) -> Result<BatchInclusionData, Sub
             );
             Err(SubmitError::SerializationError(e))
         }
-        Ok(SubmitProofResponseMessage::NonPayingAddressError) => {
-            error!("Batcher responded with non-paying address error. Funds have not been spent.");
+        Ok(SubmitProofResponseMessage::NonPayingNotAllowed) => {
+            error!("Batcher responded with: non-paying not allowed.");
             Err(SubmitError::NonPayingAddressError)
         }
     }