refactor(minor-axelarnet-gateway): msg and state separation (axelarne…

…twork#756)

contracts/axelarnet-gateway/src/contract/query.rs

@@ -2,7 +2,8 @@ use cosmwasm_std::Storage;
 use itertools::Itertools;
 use router_api::{ChainName, CrossChainId, Message};
 
-use crate::state::{self, ExecutableMessage};
+use crate::msg::ExecutableMessage;
+use crate::state;
 
 pub fn routable_messages(
     storage: &dyn Storage,
@@ -18,10 +19,12 @@ pub fn executable_messages(
     storage: &dyn Storage,
     cc_ids: Vec<CrossChainId>,
 ) -> Result<Vec<ExecutableMessage>, state::Error> {
-    cc_ids
+    let results: Vec<_> = cc_ids
         .into_iter()
         .map(|cc_id| state::load_executable_msg(storage, &cc_id))
-        .try_collect()
+        .try_collect()?;
+
+    Ok(results.into_iter().map(Into::into).collect())
 }
 
 pub fn chain_name(storage: &dyn Storage) -> ChainName {

contracts/axelarnet-gateway/src/msg.rs

@@ -4,7 +4,24 @@ use cosmwasm_std::HexBinary;
 use msgs_derive::EnsurePermissions;
 use router_api::{Address, ChainName, CrossChainId, Message};
 
-use crate::state::ExecutableMessage;
+use crate::state;
+
+impl From<state::ExecutableMessage> for ExecutableMessage {
+    fn from(value: state::ExecutableMessage) -> Self {
+        match value {
+            state::ExecutableMessage::Approved(msg) => ExecutableMessage::Approved(msg),
+            state::ExecutableMessage::Executed(msg) => ExecutableMessage::Executed(msg),
+        }
+    }
+}
+
+#[cw_serde]
+pub enum ExecutableMessage {
+    /// A message that has been sent by the router, but not executed yet.
+    Approved(Message),
+    /// An approved message that has been executed.
+    Executed(Message),
+}
 
 #[cw_serde]
 pub struct InstantiateMsg {