refactor(contracts): re-export gateway and router messages (#627)

Author: cgorenflo

contracts/gateway/src/contract.rs

@@ -5,10 +5,9 @@ use axelar_wasm_std::{address, FnExt};
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response};
 use error_stack::ResultExt;
-use gateway_api::msg::{ExecuteMsg, QueryMsg};
 use router_api::client::Router;
 
-use crate::msg::InstantiateMsg;
+use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use crate::state;
 use crate::state::Config;
 

contracts/gateway/src/msg.rs

@@ -7,3 +7,6 @@ pub struct InstantiateMsg {
     /// Address of the router contract on axelar.
     pub router_address: String,
 }
+
+// these messages are extracted into a separate package to avoid circular dependencies
+pub use gateway_api::msg::{ExecuteMsg, QueryMsg};

contracts/router/src/contract.rs

@@ -5,11 +5,10 @@ use cosmwasm_std::{
     to_json_binary, Addr, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response, Storage,
 };
 use router_api::error::Error;
-use router_api::msg::{ExecuteMsg, QueryMsg};
 
 use crate::contract::migrations::v0_3_3;
 use crate::events::RouterInstantiated;
-use crate::msg::InstantiateMsg;
+use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use crate::state;
 use crate::state::{load_chain_by_gateway, load_config, Config};
 

contracts/router/src/msg.rs

@@ -9,3 +9,6 @@ pub struct InstantiateMsg {
     // the address of the nexus gateway
     pub nexus_gateway: String,
 }
+
+// these messages are extracted into a separate package to avoid circular dependencies
+pub use router_api::msg::{ExecuteMsg, QueryMsg};