refactor(minor): make the main flow msgs consistent (#539)

axelarnetwork · Jul 24, 2024 · e4ef307 · e4ef307
1 parent febb75b
commit e4ef307
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 139 deletions.
diff --git a/contracts/gateway/src/contract.rs b/contracts/gateway/src/contract.rs
@@ -140,7 +140,7 @@ mod internal {
 
     pub(crate) fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, Error> {
         match msg {
-            QueryMsg::GetOutgoingMessages { message_ids } => {
+            QueryMsg::GetOutgoingMessages(message_ids) => {
                 let msgs = contract::query::get_outgoing_messages(deps.storage, message_ids)?;
                 to_json_binary(&msgs).change_context(Error::SerializeResponse)
             }

diff --git a/contracts/gateway/tests/contract.rs b/contracts/gateway/tests/contract.rs
@@ -138,9 +138,8 @@ fn successful_route_outgoing() {
         let router = "router";
         instantiate_contract(deps.as_mut(), "verifier", router);
 
-        let query_msg = QueryMsg::GetOutgoingMessages {
-            message_ids: msgs.iter().map(|msg| msg.cc_id.clone()).collect(),
-        };
+        let query_msg =
+            QueryMsg::GetOutgoingMessages(msgs.iter().map(|msg| msg.cc_id.clone()).collect());
 
         // check no messages are outgoing
         let query_response = query(deps.as_ref(), mock_env(), query_msg.clone());
@@ -398,7 +397,7 @@ fn correctly_working_verifier_handler(
 {
     move |msg: voting_verifier::msg::QueryMsg| -> Result<Vec<MessageStatus>, ContractError> {
         match msg {
-            voting_verifier::msg::QueryMsg::GetMessagesStatus { messages } => Ok(messages
+            voting_verifier::msg::QueryMsg::GetMessagesStatus(messages) => Ok(messages
                 .into_iter()
                 .map(|msg| {
                     MessageStatus::new(

diff --git a/contracts/gateway/tests/test_verify.json b/contracts/gateway/tests/test_verify.json
diff --git a/contracts/multisig-prover/src/contract.rs b/contracts/multisig-prover/src/contract.rs
@@ -61,9 +61,7 @@ pub fn execute(
     msg: ExecuteMsg,
 ) -> Result<Response, axelar_wasm_std::error::ContractError> {
     match msg.ensure_permissions(deps.storage, &info.sender)? {
-        ExecuteMsg::ConstructProof { message_ids } => {
-            Ok(execute::construct_proof(deps, message_ids)?)
-        }
+        ExecuteMsg::ConstructProof(message_ids) => Ok(execute::construct_proof(deps, message_ids)?),
         ExecuteMsg::UpdateVerifierSet {} => Ok(execute::update_verifier_set(deps, env)?),
         ExecuteMsg::ConfirmVerifierSet {} => Ok(execute::confirm_verifier_set(deps, info.sender)?),
         ExecuteMsg::UpdateSigningThreshold {
@@ -229,7 +227,7 @@ mod tests {
                 .collect::<Vec<CrossChainId>>()
         });
 
-        let msg = ExecuteMsg::ConstructProof { message_ids };
+        let msg = ExecuteMsg::ConstructProof(message_ids);
         execute(deps, mock_env(), mock_info(RELAYER, &[]), msg)
     }
 

diff --git a/contracts/multisig-prover/src/contract/execute.rs b/contracts/multisig-prover/src/contract/execute.rs
@@ -82,7 +82,7 @@ fn get_messages(
 ) -> Result<Vec<Message>, ContractError> {
     let length = message_ids.len();
 
-    let query = gateway_api::msg::QueryMsg::GetOutgoingMessages { message_ids };
+    let query = gateway_api::msg::QueryMsg::GetOutgoingMessages(message_ids);
     let messages: Vec<Message> = querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
         contract_addr: gateway.into(),
         msg: to_json_binary(&query)?,
@@ -288,9 +288,7 @@ fn ensure_verifier_set_verification(
     config: &Config,
     deps: &DepsMut,
 ) -> Result<(), ContractError> {
-    let query = voting_verifier::msg::QueryMsg::GetVerifierSetStatus {
-        new_verifier_set: verifier_set.clone(),
-    };
+    let query = voting_verifier::msg::QueryMsg::GetVerifierSetStatus(verifier_set.clone());
 
     let status: VerificationStatus = deps.querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
         contract_addr: config.voting_verifier.to_string(),

diff --git a/contracts/multisig-prover/src/msg.rs b/contracts/multisig-prover/src/msg.rs
@@ -63,7 +63,7 @@ pub enum ExecuteMsg {
     // Start building a proof that includes specified messages
     // Queries the gateway for actual message contents
     #[permission(Any)]
-    ConstructProof { message_ids: Vec<CrossChainId> },
+    ConstructProof(Vec<CrossChainId>),
     #[permission(Elevated)]
     UpdateVerifierSet,
 

diff --git a/contracts/voting-verifier/src/client.rs b/contracts/voting-verifier/src/client.rs
@@ -27,10 +27,8 @@ pub struct Client<'a> {
 
 impl<'a> Client<'a> {
     pub fn verify_messages(&self, messages: Vec<Message>) -> Option<WasmMsg> {
-        ignore_empty(messages).map(|messages| {
-            self.client
-                .execute(&ExecuteMsg::VerifyMessages { messages })
-        })
+        ignore_empty(messages)
+            .map(|messages| self.client.execute(&ExecuteMsg::VerifyMessages(messages)))
     }
 
     pub fn vote(&self, poll_id: PollId, votes: Vec<Vote>) -> WasmMsg {
@@ -69,14 +67,14 @@ impl<'a> Client<'a> {
             [] => Ok(vec![]),
             _ => self
                 .client
-                .query(&QueryMsg::GetMessagesStatus { messages })
+                .query(&QueryMsg::GetMessagesStatus(messages))
                 .change_context_lazy(|| Error::QueryVotingVerifier(self.client.address.clone())),
         }
     }
 
     pub fn verifier_set_status(&self, new_verifier_set: VerifierSet) -> Result<VerificationStatus> {
         self.client
-            .query(&QueryMsg::GetVerifierSetStatus { new_verifier_set })
+            .query(&QueryMsg::GetVerifierSetStatus(new_verifier_set))
             .change_context_lazy(|| Error::QueryVotingVerifier(self.client.address.clone()))
     }