From afd17ec5d99e7556158158cfe6ecadea77ba70cc Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Mon, 13 Dec 2021 08:48:39 -0700
Subject: [PATCH] Revert "Add missing InstructionError::IllegalOwner conversion
 (backport #21524) (#21548)"

This reverts commit b3904d80e6c8e992e95cebb0ac48fa0face6ee62.
---
 Cargo.lock                   |  1 -
 storage-proto/Cargo.toml     |  3 --
 storage-proto/build.rs       |  8 ------
 storage-proto/src/convert.rs | 54 +-----------------------------------
 4 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2652cf8eb4..c40aa14307 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5676,7 +5676,6 @@ version = "1.8.7"
 dependencies = [
  "bincode",
  "bs58 0.3.1",
- "enum-iterator",
  "prost",
  "serde",
  "serde_derive",
diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml
index 854a2bbcfb..7796c1e406 100644
--- a/storage-proto/Cargo.toml
+++ b/storage-proto/Cargo.toml
@@ -19,9 +19,6 @@ solana-account-decoder = { path = "../account-decoder", version = "=1.8.7" }
 solana-sdk = { path = "../sdk", version = "=1.8.7" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.8.7" }
 
-[dev-dependencies]
-enum-iterator = "0.6.0"
-
 [lib]
 crate-type = ["lib"]
 name = "solana_storage_proto"
diff --git a/storage-proto/build.rs b/storage-proto/build.rs
index 174b33aeaf..dd64c828d8 100644
--- a/storage-proto/build.rs
+++ b/storage-proto/build.rs
@@ -12,13 +12,5 @@ fn main() -> Result<(), std::io::Error> {
         .build_client(true)
         .build_server(false)
         .format(true)
-        .type_attribute(
-            "TransactionErrorType",
-            "#[cfg_attr(test, derive(enum_iterator::IntoEnumIterator))]",
-        )
-        .type_attribute(
-            "InstructionErrorType",
-            "#[cfg_attr(test, derive(enum_iterator::IntoEnumIterator))]",
-        )
         .compile(&protos, &[proto_base_path])
 }
diff --git a/storage-proto/src/convert.rs b/storage-proto/src/convert.rs
index 049d611306..27b43dd1ae 100644
--- a/storage-proto/src/convert.rs
+++ b/storage-proto/src/convert.rs
@@ -523,7 +523,6 @@ impl TryFrom<tx_by_addr::TransactionError> for TransactionError {
                     46 => InstructionError::InvalidAccountOwner,
                     47 => InstructionError::ArithmeticOverflow,
                     48 => InstructionError::UnsupportedSysvar,
-                    49 => InstructionError::IllegalOwner,
                     _ => return Err("Invalid InstructionError"),
                 };
 
@@ -849,7 +848,7 @@ impl TryFrom<tx_by_addr::TransactionByAddr> for Vec<TransactionByAddrInfo> {
 
 #[cfg(test)]
 mod test {
-    use {super::*, enum_iterator::IntoEnumIterator};
+    use super::*;
 
     #[test]
     fn test_reward_type_encode() {
@@ -1414,55 +1413,4 @@ mod test {
             tx_by_addr_transaction_error.try_into().unwrap()
         );
     }
-
-    #[test]
-    fn test_error_enums() {
-        let ix_index = 1;
-        let custom_error = 42;
-        for error in tx_by_addr::TransactionErrorType::into_enum_iter() {
-            if error != tx_by_addr::TransactionErrorType::InstructionError {
-                let tx_by_addr_error = tx_by_addr::TransactionError {
-                    transaction_error: error as i32,
-                    instruction_error: None,
-                };
-                let transaction_error: TransactionError = tx_by_addr_error
-                    .clone()
-                    .try_into()
-                    .unwrap_or_else(|_| panic!("{:?} conversion implemented?", error));
-                assert_eq!(tx_by_addr_error, transaction_error.into());
-            } else {
-                for ix_error in tx_by_addr::InstructionErrorType::into_enum_iter() {
-                    if ix_error != tx_by_addr::InstructionErrorType::Custom {
-                        let tx_by_addr_error = tx_by_addr::TransactionError {
-                            transaction_error: error as i32,
-                            instruction_error: Some(tx_by_addr::InstructionError {
-                                index: ix_index,
-                                error: ix_error as i32,
-                                custom: None,
-                            }),
-                        };
-                        let transaction_error: TransactionError = tx_by_addr_error
-                            .clone()
-                            .try_into()
-                            .unwrap_or_else(|_| panic!("{:?} conversion implemented?", ix_error));
-                        assert_eq!(tx_by_addr_error, transaction_error.into());
-                    } else {
-                        let tx_by_addr_error = tx_by_addr::TransactionError {
-                            transaction_error: error as i32,
-                            instruction_error: Some(tx_by_addr::InstructionError {
-                                index: ix_index,
-                                error: ix_error as i32,
-                                custom: Some(tx_by_addr::CustomError {
-                                    custom: custom_error,
-                                }),
-                            }),
-                        };
-                        let transaction_error: TransactionError =
-                            tx_by_addr_error.clone().try_into().unwrap();
-                        assert_eq!(tx_by_addr_error, transaction_error.into());
-                    }
-                }
-            }
-        }
-    }
 }