Revert some unused code changes...

ryoqun · Jun 10, 2024 · d4c4004 · d4c4004
1 parent aae7078
commit d4c4004
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -249,7 +249,7 @@ struct RentMetrics {
 pub type BankStatusCache = StatusCache<Result<()>>;
 #[cfg_attr(
     feature = "frozen-abi",
-    frozen_abi(digest = "CyD3t1HF7U63HhZawzETFFfo8XydftV8X7rnUTKtiN1G")
+    frozen_abi(digest = "9Pf3NTGr1AEzB4nKaVBY24uNwoQR4aJi8vc96W6kGvNk")
 )]
 pub type BankSlotDelta = SlotDelta<Result<()>>;
 

diff --git a/sdk/src/transaction/error.rs b/sdk/src/transaction/error.rs
@@ -172,12 +172,6 @@ pub enum TransactionError {
     /// Program cache hit max limit.
     #[error("Program cache hit max limit")]
     ProgramCacheHitMaxLimit,
-
-    /// Transaction processing is cancelled due to a panic or already aborted scheduler.
-    #[error(
-        "Transaction processing hasn't been completed due to a cancellation triggered internally"
-    )]
-    ProcessingCancelled,
 }
 
 impl From<SanitizeError> for TransactionError {

diff --git a/storage-proto/proto/transaction_by_addr.proto b/storage-proto/proto/transaction_by_addr.proto
@@ -63,7 +63,6 @@ enum TransactionErrorType {
     PROGRAM_EXECUTION_TEMPORARILY_RESTRICTED = 35;
     UNBALANCED_TRANSACTION = 36;
     PROGRAM_CACHE_HIT_MAX_LIMIT = 37;
-    PROCESSING_CANCELLED = 38;
 }
 
 message InstructionError {

diff --git a/storage-proto/src/convert.rs b/storage-proto/src/convert.rs
@@ -816,7 +816,6 @@ impl TryFrom<tx_by_addr::TransactionError> for TransactionError {
             34 => TransactionError::ResanitizationNeeded,
             36 => TransactionError::UnbalancedTransaction,
             37 => TransactionError::ProgramCacheHitMaxLimit,
-            38 => TransactionError::ProcessingCancelled,
             _ => return Err("Invalid TransactionError"),
         })
     }
@@ -938,9 +937,6 @@ impl From<TransactionError> for tx_by_addr::TransactionError {
                 TransactionError::ProgramCacheHitMaxLimit => {
                     tx_by_addr::TransactionErrorType::ProgramCacheHitMaxLimit
                 }
-                TransactionError::ProcessingCancelled => {
-                    tx_by_addr::TransactionErrorType::ProcessingCancelled
-                }
             } as i32,
             instruction_error: match transaction_error {
                 TransactionError::InstructionError(index, ref instruction_error) => {