refactor: remove superfluous CommandExecuted contract type

contracts/axelar-gateway/src/contract.rs

@@ -6,7 +6,7 @@ use soroban_sdk::{contract, contractimpl, Address, Bytes, BytesN, Env, String};
 use axelar_auth_verifier::AxelarAuthVerifierClient;
 
 use crate::interface::AxelarGatewayInterface;
-use crate::storage_types::{CommandExecutedKey, ContractCallApprovalKey, DataKey};
+use crate::storage_types::{ContractCallApprovalKey, DataKey};
 use crate::types::{self, Command, SignedCommandBatch};
 use crate::{error::Error, event};
 
@@ -125,7 +125,7 @@ impl AxelarGatewayInterface for AxelarGateway {
         }
 
         for (command_id, command) in batch.commands {
-            let key = Self::command_executed_key(command_id.clone());
+            let key = DataKey::CommandExecuted(command_id.clone());
 
             // TODO: switch to full revert, or add allow selecting subset of commands to process
             // Skip command if already executed. This allows batches to be processed partially.
@@ -168,10 +168,6 @@ impl AxelarGateway {
         })
     }
 
-    fn command_executed_key(command_id: BytesN<32>) -> DataKey {
-        DataKey::CommandExecuted(CommandExecutedKey { command_id })
-    }
-
     fn approve_contract_call(
         env: &Env,
         command_id: BytesN<32>,

contracts/axelar-gateway/src/storage_types.rs

@@ -10,17 +10,12 @@ pub struct ContractCallApprovalKey {
     pub payload_hash: BytesN<32>,
 }
 
-#[contracttype]
-#[derive(Clone, Debug)]
-pub struct CommandExecutedKey {
-    pub command_id: BytesN<32>,
-}
 
 #[contracttype]
 #[derive(Clone, Debug)]
 pub enum DataKey {
     Initialized,
     AuthModule,
-    CommandExecuted(CommandExecutedKey),
+    CommandExecuted(BytesN<32>),
     ContractCallApproval(ContractCallApprovalKey),
 }