chore: simplify cosmos proto dependencies (axelarnetwork#445)

eigerco · Jun 5, 2024 · bf6750b · bf6750b
1 parent fe08c00
commit bf6750b
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 82 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ampd/Cargo.toml b/ampd/Cargo.toml
@@ -13,8 +13,7 @@ base64 = "0.21.2"
 bcs = "0.1.5"
 clap = { version = "4.2.7", features = ["derive", "cargo"] }
 config = "0.13.2"
-cosmos-sdk-proto = "0.16.0"
-cosmrs = { version = "0.14.0", features = ["cosmwasm"] }
+cosmrs = { version = "0.14.0", features = ["cosmwasm", "grpc"] }
 cosmwasm-std = { workspace = true, features = ["stargate"] }
 deref-derive = "0.1.0"
 dirs = "5.0.1"
@@ -58,7 +57,7 @@ tokio = { version = "1.22.0", features = ["signal"] }
 tokio-stream = { version = "0.1.11", features = ["sync"] }
 tokio-util = "0.7.8"
 toml = "0.5.9"
-tonic = "0.8.3"
+tonic = "0.9.2"
 tracing = { version = "0.1.37", features = ["valuable", "log"] }
 tracing-core = { version = "0.1.30", features = ["valuable"] }
 tracing-subscriber = { version = "0.3.16", features = ["json", "valuable"] }

diff --git a/ampd/src/broadcaster.rs b/ampd/src/broadcaster.rs
@@ -4,11 +4,11 @@ use std::time::Duration;
 use std::{cmp, thread};
 
 use async_trait::async_trait;
-use cosmos_sdk_proto::cosmos::base::abci::v1beta1::TxResponse;
-use cosmos_sdk_proto::cosmos::tx::v1beta1::{
+use cosmrs::proto::cosmos::base::abci::v1beta1::TxResponse;
+use cosmrs::proto::cosmos::tx::v1beta1::{
     BroadcastMode, BroadcastTxRequest, GetTxRequest, GetTxResponse, SimulateRequest,
 };
-use cosmos_sdk_proto::traits::MessageExt;
+use cosmrs::proto::traits::MessageExt;
 use cosmrs::tendermint::chain::Id;
 use cosmrs::tx::Fee;
 use cosmrs::{Coin, Gas};
@@ -51,7 +51,7 @@ pub enum Error {
     #[error("failed to confirm tx inclusion in block")]
     TxConfirmation,
     #[error("failed to execute tx")]
-    Execution { response: TxResponse },
+    Execution { response: Box<TxResponse> },
     #[error("failed to query account information for address {address}")]
     QueryAccount { address: TMAddress },
 }
@@ -290,7 +290,9 @@ fn evaluate_response(response: Result<GetTxResponse, Status>) -> ConfirmationRes
             ..
         }) => match response {
             TxResponse { code: 0, .. } => ConfirmationResult::Success,
-            _ => ConfirmationResult::Critical(Error::Execution { response }),
+            _ => ConfirmationResult::Critical(Error::Execution {
+                response: Box::new(response),
+            }),
         },
     }
 }
@@ -303,11 +305,11 @@ enum ConfirmationResult {
 
 #[cfg(test)]
 mod tests {
-    use cosmos_sdk_proto::cosmos::auth::v1beta1::{BaseAccount, QueryAccountResponse};
-    use cosmos_sdk_proto::cosmos::base::abci::v1beta1::{GasInfo, TxResponse};
-    use cosmos_sdk_proto::cosmos::tx::v1beta1::{GetTxResponse, SimulateResponse};
-    use cosmos_sdk_proto::traits::MessageExt;
-    use cosmos_sdk_proto::Any;
+    use cosmrs::proto::cosmos::auth::v1beta1::{BaseAccount, QueryAccountResponse};
+    use cosmrs::proto::cosmos::base::abci::v1beta1::{GasInfo, TxResponse};
+    use cosmrs::proto::cosmos::tx::v1beta1::{GetTxResponse, SimulateResponse};
+    use cosmrs::proto::traits::MessageExt;
+    use cosmrs::proto::Any;
     use cosmrs::{bank::MsgSend, tx::Msg, AccountId};
     use ecdsa::SigningKey;
     use rand::rngs::OsRng;
@@ -642,16 +644,11 @@ mod tests {
             .build();
         let msgs = vec![dummy_msg()];
 
-        assert!(matches!(
-            broadcaster
-                .broadcast(msgs)
-                .await
-                .unwrap_err()
-                .current_context(),
-            Error::Execution {
-                response: TxResponse { code: 32, .. }
-            }
-        ));
+        let report = broadcaster.broadcast(msgs).await.unwrap_err();
+        assert!(matches!(report.current_context(), Error::Execution { .. }));
+        if let Error::Execution { response } = report.current_context() {
+            assert_eq!(response.code, 32);
+        }
     }
 
     #[test]

diff --git a/ampd/src/broadcaster/accounts.rs b/ampd/src/broadcaster/accounts.rs
@@ -1,5 +1,5 @@
-use cosmos_sdk_proto::cosmos::auth::v1beta1::{BaseAccount, QueryAccountRequest};
-use cosmos_sdk_proto::traits::Message;
+use cosmrs::proto::cosmos::auth::v1beta1::{BaseAccount, QueryAccountRequest};
+use cosmrs::proto::traits::Message;
 use error_stack::{Result, ResultExt};
 use thiserror::Error;
 
@@ -54,9 +54,9 @@ where
 
 #[cfg(test)]
 mod tests {
-    use cosmos_sdk_proto::cosmos::auth::v1beta1::BaseAccount;
-    use cosmos_sdk_proto::cosmos::auth::v1beta1::QueryAccountResponse;
-    use cosmos_sdk_proto::traits::MessageExt;
+    use cosmrs::proto::cosmos::auth::v1beta1::BaseAccount;
+    use cosmrs::proto::cosmos::auth::v1beta1::QueryAccountResponse;
+    use cosmrs::proto::traits::MessageExt;
     use cosmrs::Any;
     use ecdsa::SigningKey;
     use rand::rngs::OsRng;

diff --git a/ampd/src/broadcaster/clients.rs b/ampd/src/broadcaster/clients.rs
@@ -1,9 +1,9 @@
 use async_trait::async_trait;
-use cosmos_sdk_proto::cosmos::auth::v1beta1::query_client::QueryClient;
-use cosmos_sdk_proto::cosmos::auth::v1beta1::{QueryAccountRequest, QueryAccountResponse};
-use cosmos_sdk_proto::cosmos::base::abci::v1beta1::TxResponse;
-use cosmos_sdk_proto::cosmos::tx::v1beta1::service_client::ServiceClient;
-use cosmos_sdk_proto::cosmos::tx::v1beta1::{
+use cosmrs::proto::cosmos::auth::v1beta1::query_client::QueryClient;
+use cosmrs::proto::cosmos::auth::v1beta1::{QueryAccountRequest, QueryAccountResponse};
+use cosmrs::proto::cosmos::base::abci::v1beta1::TxResponse;
+use cosmrs::proto::cosmos::tx::v1beta1::service_client::ServiceClient;
+use cosmrs::proto::cosmos::tx::v1beta1::{
     BroadcastTxRequest, GetTxRequest, GetTxResponse, SimulateRequest, SimulateResponse,
 };
 use error_stack::{Report, Result};

diff --git a/ampd/src/broadcaster/tx.rs b/ampd/src/broadcaster/tx.rs
@@ -98,7 +98,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use cosmos_sdk_proto::Any;
+    use cosmrs::proto::Any;
     use cosmrs::{
         bank::MsgSend,
         bip32::secp256k1::elliptic_curve::rand_core::OsRng,

diff --git a/ampd/src/commands/mod.rs b/ampd/src/commands/mod.rs
@@ -1,11 +1,11 @@
 use std::path::Path;
 
 use clap::Subcommand;
-use cosmos_sdk_proto::cosmos::base::abci::v1beta1::TxResponse;
-use cosmos_sdk_proto::cosmos::{
+use cosmrs::proto::cosmos::base::abci::v1beta1::TxResponse;
+use cosmrs::proto::cosmos::{
     auth::v1beta1::query_client::QueryClient, tx::v1beta1::service_client::ServiceClient,
 };
-use cosmos_sdk_proto::Any;
+use cosmrs::proto::Any;
 use cosmrs::AccountId;
 use error_stack::Result;
 use error_stack::ResultExt;

diff --git a/ampd/src/grpc/ampd.rs b/ampd/src/grpc/ampd.rs
@@ -127,7 +127,7 @@ mod tests {
     use std::collections::HashMap;
     use std::time::Duration;
 
-    use cosmos_sdk_proto::Any;
+    use cosmrs::proto::Any;
     use cosmrs::{bank::MsgSend, tx::Msg, AccountId};
     use error_stack::Report;
     use events::Event;

diff --git a/ampd/src/handlers/multisig.rs b/ampd/src/handlers/multisig.rs
@@ -184,7 +184,7 @@ mod test {
 
     use base64::engine::general_purpose::STANDARD;
     use base64::Engine;
-    use cosmos_sdk_proto::cosmos::base::abci::v1beta1::TxResponse;
+    use cosmrs::proto::cosmos::base::abci::v1beta1::TxResponse;
     use cosmrs::AccountId;
     use cosmwasm_std::{HexBinary, Uint64};
     use ecdsa::SigningKey;

diff --git a/ampd/src/lib.rs b/ampd/src/lib.rs
@@ -2,7 +2,7 @@ use std::pin::Pin;
 use std::time::Duration;
 
 use block_height_monitor::BlockHeightMonitor;
-use cosmos_sdk_proto::cosmos::{
+use cosmrs::proto::cosmos::{
     auth::v1beta1::query_client::QueryClient, tx::v1beta1::service_client::ServiceClient,
 };
 use error_stack::{report, FutureExt, Result, ResultExt};

diff --git a/ampd/src/queue/msg_queue.rs b/ampd/src/queue/msg_queue.rs
@@ -44,7 +44,7 @@ impl MsgQueue {
 
 #[cfg(test)]
 mod test {
-    use cosmos_sdk_proto::Any;
+    use cosmrs::proto::Any;
     use cosmrs::{bank::MsgSend, tx::Msg, AccountId};
 
     use super::MsgQueue;

diff --git a/ampd/src/queue/queued_broadcaster.rs b/ampd/src/queue/queued_broadcaster.rs
@@ -174,7 +174,7 @@ where
 
 #[cfg(test)]
 mod test {
-    use cosmos_sdk_proto::cosmos::base::abci::v1beta1::TxResponse;
+    use cosmrs::proto::cosmos::base::abci::v1beta1::TxResponse;
     use cosmrs::tx::Fee;
     use cosmrs::Any;
     use cosmrs::{bank::MsgSend, tx::Msg, AccountId};