Reflect ibc-rs PR 1318 changes (#191)

* Update ibc and ibc-query dependencies to 0.54 * Update basecoin to reflect ibc-rs PR 1318
informalsystems · Aug 22, 2024 · d833faa · d833faa
1 parent 4f35129
commit d833faa
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 65 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,8 +30,8 @@ tracing            = "0.1.40"
 tracing-subscriber = "0.3.18"
 
 # ibc dependencies
-ibc       = { version = "0.53.0", default-features = false, features = [ "serde" ] }
-ibc-query = { version = "0.53.0", default-features = false }
+ibc       = { version = "0.54.0", default-features = false, features = [ "serde" ] }
+ibc-query = { version = "0.54.0", default-features = false }
 ibc-proto = { version = "0.47.0", default-features = false }
 ics23     = { version = "0.12", default-features = false }
 
@@ -45,8 +45,8 @@ tendermint-rpc   = { version = "0.38", default-features = false }
 tower-abci = { version = "0.16" }
 
 [patch.crates-io]
-ibc       = { git = "https://github.com/cosmos/ibc-rs.git", rev = "6c7a65e" }
-ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "6c7a65e" }
+ibc       = { git = "https://github.com/cosmos/ibc-rs.git", rev = "a36348b" }
+ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "a36348b" }
 
 # for tendermint 0.38
 tower-abci = { git = "https://github.com/informalsystems/tower-abci", rev = "0992541" }
diff --git a/basecoin/modules/src/ibc/transfer.rs b/basecoin/modules/src/ibc/transfer.rs
@@ -60,7 +60,7 @@ where
             ACCOUNT_PREFIX,
             &cosmos_adr028_escrow_address(port_id, channel_id),
         )
-        .map_err(|_| TokenTransferError::ParseAccountFailure)?;
+        .map_err(|_| TokenTransferError::FailedToParseAccount)?;
 
         Ok(account_id)
     }
@@ -379,12 +379,12 @@ where
         let from = from_account
             .to_string()
             .parse()
-            .map_err(|_| TokenTransferError::ParseAccountFailure)?;
+            .map_err(|_| TokenTransferError::FailedToParseAccount)?;
         let to = self
             .get_escrow_account(port_id, channel_id)?
             .to_string()
             .parse()
-            .map_err(|_| TokenTransferError::ParseAccountFailure)?;
+            .map_err(|_| TokenTransferError::FailedToParseAccount)?;
         let coins = vec![Coin {
             denom: Denom(coin.denom.to_string()),
             amount: coin.amount.into(),
@@ -404,11 +404,11 @@ where
             .get_escrow_account(port_id, channel_id)?
             .to_string()
             .parse()
-            .map_err(|_| TokenTransferError::ParseAccountFailure)?;
+            .map_err(|_| TokenTransferError::FailedToParseAccount)?;
         let to = to_account
             .to_string()
             .parse()
-            .map_err(|_| TokenTransferError::ParseAccountFailure)?;
+            .map_err(|_| TokenTransferError::FailedToParseAccount)?;
         let coins = vec![Coin {
             denom: Denom(coin.denom.to_string()),
             amount: coin.amount.into(),
@@ -425,7 +425,7 @@ where
         let account = account
             .to_string()
             .parse()
-            .map_err(|_| TokenTransferError::ParseAccountFailure)?;
+            .map_err(|_| TokenTransferError::FailedToParseAccount)?;
         let coins = vec![Coin {
             denom: Denom(amt.denom.to_string()),
             amount: amt.amount.into(),
@@ -443,7 +443,7 @@ where
         let account = account
             .to_string()
             .parse()
-            .map_err(|_| TokenTransferError::ParseAccountFailure)?;
+            .map_err(|_| TokenTransferError::FailedToParseAccount)?;
         let coins = vec![Coin {
             denom: Denom(amt.denom.to_string()),
             amount: amt.amount.into(),