refactor(connection-router-api): replace dependencies of connection-r…

…outer with connection-router-api (#273)

* refactor(connection-router-api): replace dependencies of connection-router with connection-router-api

* fix linting

ampd/Cargo.toml

@@ -12,7 +12,7 @@ base64 = "0.21.2"
 bcs = "0.1.5"
 clap = { version = "4.2.7", features = ["derive", "cargo"] }
 config = "0.13.2"
-connection-router = { workspace = true }
+connection-router-api = { workspace = true }
 cosmos-sdk-proto = "0.16.0"
 cosmrs = { version = "0.14.0", features = ["cosmwasm"] }
 cosmwasm-std = { version = "1.2.1", features = ["stargate"] }

ampd/src/commands/deregister_chain_support.rs

@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use axelar_wasm_std::nonempty;
-use connection_router::state::ChainName;
+use connection_router_api::ChainName;
 use cosmrs::cosmwasm::MsgExecuteContract;
 use cosmrs::tx::Msg;
 use error_stack::Result;

ampd/src/commands/register_chain_support.rs

@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use axelar_wasm_std::nonempty;
-use connection_router::state::ChainName;
+use connection_router_api::ChainName;
 use cosmrs::cosmwasm::MsgExecuteContract;
 use cosmrs::tx::Msg;
 use error_stack::Result;

ampd/src/evm/mod.rs

@@ -15,18 +15,20 @@ pub enum ChainName {
     Other(String),
 }
 
-impl PartialEq<connection_router::state::ChainName> for ChainName {
-    fn eq(&self, other: &connection_router::state::ChainName) -> bool {
+impl PartialEq<connection_router_api::ChainName> for ChainName {
+    fn eq(&self, other: &connection_router_api::ChainName) -> bool {
         self.to_string().eq_ignore_ascii_case(other.as_ref())
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::evm;
-    use connection_router::state::ChainName;
     use std::str::FromStr;
 
+    use connection_router_api::ChainName;
+
+    use crate::evm;
+
     #[test]
     fn chain_name_partial_eq() {
         let chain_name = evm::ChainName::Ethereum;

ampd/src/handlers/evm_verify_msg.rs

@@ -12,7 +12,7 @@ use tracing::{info, info_span};
 use valuable::Valuable;
 
 use axelar_wasm_std::voting::{PollId, Vote};
-use connection_router::state::ID_SEPARATOR;
+use connection_router_api::ID_SEPARATOR;
 use events::Error::EventTypeMismatch;
 use events_derive::try_from;
 use voting_verifier::msg::ExecuteMsg;
@@ -33,7 +33,7 @@ pub struct Message {
     pub tx_id: Hash,
     pub event_index: u64,
     pub destination_address: String,
-    pub destination_chain: connection_router::state::ChainName,
+    pub destination_chain: connection_router_api::ChainName,
     pub source_address: EVMAddress,
     pub payload_hash: Hash,
 }
@@ -42,7 +42,7 @@ pub struct Message {
 #[try_from("wasm-messages_poll_started")]
 struct PollStartedEvent {
     poll_id: PollId,
-    source_chain: connection_router::state::ChainName,
+    source_chain: connection_router_api::ChainName,
     source_gateway_address: EVMAddress,
     confirmation_height: u64,
     expires_at: u64,

ampd/src/handlers/evm_verify_worker_set.rs

@@ -13,7 +13,7 @@ use events::Error::EventTypeMismatch;
 use events_derive::try_from;
 
 use axelar_wasm_std::voting::{PollId, Vote};
-use connection_router::state::ID_SEPARATOR;
+use connection_router_api::ID_SEPARATOR;
 use voting_verifier::msg::ExecuteMsg;
 
 use crate::event_processor::EventHandler;
@@ -43,7 +43,7 @@ pub struct WorkerSetConfirmation {
 struct PollStartedEvent {
     worker_set: WorkerSetConfirmation,
     poll_id: PollId,
-    source_chain: connection_router::state::ChainName,
+    source_chain: connection_router_api::ChainName,
     source_gateway_address: EVMAddress,
     expires_at: u64,
     confirmation_height: u64,

ampd/src/handlers/multisig.rs

@@ -191,7 +191,7 @@ mod test {
 
     use base64::engine::general_purpose::STANDARD;
     use base64::Engine;
-    use connection_router::state::ChainName;
+    use connection_router_api::ChainName;
     use cosmos_sdk_proto::cosmos::base::abci::v1beta1::TxResponse;
     use cosmrs::{AccountId, Gas};
     use cosmwasm_std::{HexBinary, Uint64};

ampd/src/handlers/sui_verify_msg.rs

@@ -27,7 +27,7 @@ pub struct Message {
     pub tx_id: TransactionDigest,
     pub event_index: u64,
     pub destination_address: String,
-    pub destination_chain: connection_router::state::ChainName,
+    pub destination_chain: connection_router_api::ChainName,
     pub source_address: SuiAddress,
     pub payload_hash: Hash,
 }

ampd/src/handlers/sui_verify_worker_set.rs

@@ -9,7 +9,7 @@ use tokio::sync::watch::Receiver;
 use tracing::{info, info_span};
 
 use axelar_wasm_std::voting::{PollId, Vote};
-use connection_router::state::ID_SEPARATOR;
+use connection_router_api::ID_SEPARATOR;
 use cosmwasm_std::HexBinary;
 use cosmwasm_std::Uint128;
 use events::{Error::EventTypeMismatch, Event};

ampd/src/sui/verifier.rs

@@ -132,7 +132,7 @@ pub fn verify_worker_set(
 #[cfg(test)]
 mod tests {
     use axelar_wasm_std::voting::Vote;
-    use connection_router::state::ChainName;
+    use connection_router_api::ChainName;
     use cosmwasm_std::HexBinary;
     use ethers::abi::AbiEncode;
     use move_core_types::language_storage::StructTag;

contracts/aggregate-verifier/Cargo.toml

@@ -35,7 +35,7 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 [dependencies]
 axelar-wasm-std = { workspace = true }
 axelar-wasm-std-derive = { workspace = true }
-connection-router = { workspace = true, features = ["library"] }
+connection-router-api = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 cosmwasm-storage = { workspace = true }

contracts/aggregate-verifier/src/client.rs

@@ -1,7 +1,6 @@
 use axelar_wasm_std::utils::TryMapExt;
 use axelar_wasm_std::{FnExt, VerificationStatus};
-use connection_router::state::CrossChainId;
-use connection_router::Message;
+use connection_router_api::{CrossChainId, Message};
 use cosmwasm_std::{to_binary, Addr, QuerierWrapper, QueryRequest, WasmMsg, WasmQuery};
 use error_stack::{Result, ResultExt};
 use serde::de::DeserializeOwned;
@@ -91,7 +90,7 @@ pub enum Error {
 #[cfg(test)]
 mod tests {
     use axelar_wasm_std::VerificationStatus;
-    use connection_router::state::CrossChainId;
+    use connection_router_api::CrossChainId;
     use cosmwasm_std::testing::MockQuerier;
     use std::str::FromStr;
 

contracts/aggregate-verifier/src/contract.rs

@@ -1,5 +1,5 @@
 use axelar_wasm_std::VerificationStatus;
-use connection_router::state::CrossChainId;
+use connection_router_api::CrossChainId;
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
@@ -47,7 +47,7 @@ pub fn execute(
 pub mod execute {
     use cosmwasm_std::{to_binary, SubMsg, WasmMsg};
 
-    use connection_router::state::Message;
+    use connection_router_api::Message;
 
     use super::*;
 

contracts/aggregate-verifier/src/error.rs

@@ -8,7 +8,7 @@ pub enum ContractError {
     Std(#[from] StdError),
 
     #[error(transparent)]
-    RouterError(#[from] connection_router::ContractError),
+    RouterError(#[from] connection_router_api::error::Error),
 
     #[error("received invalid verifier reply: {0}")]
     InvalidVerifierReply(String),

contracts/aggregate-verifier/src/msg.rs

@@ -1,5 +1,5 @@
 use axelar_wasm_std::VerificationStatus;
-use connection_router::state::Message;
+use connection_router_api::Message;
 use cosmwasm_schema::{cw_serde, QueryResponses};
 
 #[cw_serde]
@@ -16,6 +16,6 @@ pub enum ExecuteMsg {
 #[cw_serde]
 #[derive(QueryResponses)]
 pub enum QueryMsg {
-    #[returns(Vec<(connection_router::state::CrossChainId, VerificationStatus)>)]
+    #[returns(Vec<(connection_router_api::CrossChainId, VerificationStatus)>)]
     GetMessagesStatus { messages: Vec<Message> },
 }

contracts/aggregate-verifier/tests/mock.rs

@@ -1,6 +1,6 @@
 use aggregate_verifier::error::ContractError;
 use axelar_wasm_std::VerificationStatus;
-use connection_router::state::{CrossChainId, Message};
+use connection_router_api::{CrossChainId, Message};
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{to_binary, Addr, DepsMut, Env, MessageInfo, Response};
 use cw_multi_test::{App, ContractWrapper, Executor};

contracts/aggregate-verifier/tests/test.rs

@@ -1,6 +1,6 @@
 use aggregate_verifier::msg::ExecuteMsg;
 use axelar_wasm_std::VerificationStatus;
-use connection_router::state::{CrossChainId, Message, ID_SEPARATOR};
+use connection_router_api::{CrossChainId, Message, ID_SEPARATOR};
 use cosmwasm_std::from_binary;
 use cosmwasm_std::Addr;
 use cw_multi_test::{App, Executor};

contracts/connection-router/Cargo.toml

@@ -35,6 +35,7 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 [dependencies]
 axelar-wasm-std = { workspace = true }
 axelar-wasm-std-derive = { workspace = true }
+connection-router-api = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 cosmwasm-storage = { workspace = true }

contracts/connection-router/src/bin/schema.rs

@@ -1,6 +1,7 @@
+use connection_router_api::msg::{ExecuteMsg, QueryMsg};
 use cosmwasm_schema::write_api;
 
-use connection_router::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use connection_router::msg::InstantiateMsg;
 
 fn main() {
     write_api! {

contracts/connection-router/src/contract.rs

@@ -1,9 +1,10 @@
+use connection_router_api::msg::{ExecuteMsg, QueryMsg};
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response};
 
 use crate::events::RouterInstantiated;
-use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use crate::msg::InstantiateMsg;
 use crate::state::{Config, RouterStore, Store};
 
 mod execute;