refactor(minor-axelarnet-gateway): msg and state separation (#766)

contracts/axelarnet-gateway/src/msg.rs

@@ -4,17 +4,6 @@ use cosmwasm_std::HexBinary;
 use msgs_derive::EnsurePermissions;
 use router_api::{Address, ChainName, CrossChainId, Message};
 
-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.

contracts/axelarnet-gateway/src/state.rs

@@ -5,6 +5,8 @@ use cw_storage_plus::{Item, Map};
 use error_stack::report;
 use router_api::{ChainName, CrossChainId, Message};
 
+use crate::msg;
+
 const CONFIG: Item<Config> = Item::new("config");
 const ROUTABLE_MESSAGES: Map<&CrossChainId, Message> = Map::new("routable_messages");
 const EXECUTABLE_MESSAGES: Map<&CrossChainId, ExecutableMessage> = Map::new("executable_messages");
@@ -52,6 +54,15 @@ impl ExecutableMessage {
     }
 }
 
+impl From<ExecutableMessage> for msg::ExecutableMessage {
+    fn from(value: ExecutableMessage) -> Self {
+        match value {
+            ExecutableMessage::Approved(msg) => msg::ExecutableMessage::Approved(msg),
+            ExecutableMessage::Executed(msg) => msg::ExecutableMessage::Executed(msg),
+        }
+    }
+}
+
 pub fn save_config(storage: &mut dyn Storage, value: &Config) -> Result<(), Error> {
     Ok(CONFIG.save(storage, value)?)
 }