fixup! Add TransactionNonceNotMatch exception

golemfactory · Jul 13, 2018 · f6890f9 · f6890f9
1 parent b54dfd6
commit f6890f9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/concent_api/common/constants.py b/concent_api/common/constants.py
@@ -60,13 +60,13 @@ class ErrorCode(enum.Enum):
     QUEUE_WRONG_STATE                                                   = 'queue.wrong_state'
     REQUEST_BODY_NOT_EMPTY                                              = 'request_body.not_empty'
     SUBTASK_DUPLICATE_REQUEST                                           = 'subtask.duplicate_request'
-    TRANSACTION_NONCE_NOT_MATCH                                         = 'transaction.nonce.not_match'
-    VERIFIER_COMPUTING_SSIM_FAILED                                     = 'verifier.computing_ssim_failed'
-    VERIFIER_FILE_DOWNLOAD_FAILED                                      = 'verifier.file_download_failed'
-    VERIFIER_LOADING_FILES_INTO_MEMORY_FAILED                          = 'verifier.loading_files_into_memory_failed'
-    VERIFIER_LOADING_FILES_WITH_OPENCV_FAILED                          = 'verifier.loading_files_with_opencv_failed'
-    VERIFIER_RUNNING_BLENDER_FAILED                                    = 'verifier.running_blender_failed'
-    VERIFIER_UNPACKING_ARCHIVE_FAILED                                  = 'verifier.unpacking_archive_failed'
+    TRANSACTION_NONCE_MISMATCH                                          = 'transaction.nonce.mismatch'
+    VERIFIER_COMPUTING_SSIM_FAILED                                      = 'verifier.computing_ssim_failed'
+    VERIFIER_FILE_DOWNLOAD_FAILED                                       = 'verifier.file_download_failed'
+    VERIFIER_LOADING_FILES_INTO_MEMORY_FAILED                           = 'verifier.loading_files_into_memory_failed'
+    VERIFIER_LOADING_FILES_WITH_OPENCV_FAILED                           = 'verifier.loading_files_with_opencv_failed'
+    VERIFIER_RUNNING_BLENDER_FAILED                                     = 'verifier.running_blender_failed'
+    VERIFIER_UNPACKING_ARCHIVE_FAILED                                   = 'verifier.unpacking_archive_failed'
 
 
 class MessageIdField(enum.Enum):

diff --git a/concent_api/core/exceptions.py b/concent_api/core/exceptions.py
@@ -25,5 +25,5 @@ class FrameNumberValidationError(ConcentBaseException):
     pass
 
 
-class TransactionNonceNotMatchError(ConcentBaseException):
+class TransactionNonceNotMatchError(Exception):
     pass
diff --git a/concent_api/core/payments/storage.py b/concent_api/core/payments/storage.py
@@ -11,6 +11,7 @@
 from core.models import PendingEthereumTransaction
 
 from core.exceptions import TransactionNonceNotMatchError
+from common.constants import ErrorCode
 
 logger = logging.getLogger(__name__)
 
@@ -73,6 +74,7 @@ def put_tx_and_inc_nonce(self, tx: Transaction) -> None:
                 f'Transaction nonce does not match. '
                 f'Current={global_transaction_state.nonce}, '
                 f'Transaction={tx.nonce}',
+                ErrorCode.TRANSACTION_NONCE_MISMATCH,
             )
 
         pending_ethereum_transaction = PendingEthereumTransaction(
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,5 +25,5 @@ class FrameNumberValidationError(ConcentBaseException): @@
         pass
-    class TransactionNonceNotMatchError(ConcentBaseException):
+    class TransactionNonceNotMatchError(Exception):
         pass