Skip to content

Commit d833faa

Browse files
authored
Reflect ibc-rs PR 1318 changes (#191)
* Update ibc and ibc-query dependencies to 0.54 * Update basecoin to reflect ibc-rs PR 1318
1 parent 4f35129 commit d833faa

File tree

3 files changed

+65
-65
lines changed

3 files changed

+65
-65
lines changed

Cargo.lock

Lines changed: 54 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ tracing = "0.1.40"
3030
tracing-subscriber = "0.3.18"
3131

3232
# ibc dependencies
33-
ibc = { version = "0.53.0", default-features = false, features = [ "serde" ] }
34-
ibc-query = { version = "0.53.0", default-features = false }
33+
ibc = { version = "0.54.0", default-features = false, features = [ "serde" ] }
34+
ibc-query = { version = "0.54.0", default-features = false }
3535
ibc-proto = { version = "0.47.0", default-features = false }
3636
ics23 = { version = "0.12", default-features = false }
3737

@@ -45,8 +45,8 @@ tendermint-rpc = { version = "0.38", default-features = false }
4545
tower-abci = { version = "0.16" }
4646

4747
[patch.crates-io]
48-
ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "6c7a65e" }
49-
ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "6c7a65e" }
48+
ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "a36348b" }
49+
ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "a36348b" }
5050

5151
# for tendermint 0.38
5252
tower-abci = { git = "https://github.com/informalsystems/tower-abci", rev = "0992541" }

basecoin/modules/src/ibc/transfer.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ where
6060
ACCOUNT_PREFIX,
6161
&cosmos_adr028_escrow_address(port_id, channel_id),
6262
)
63-
.map_err(|_| TokenTransferError::ParseAccountFailure)?;
63+
.map_err(|_| TokenTransferError::FailedToParseAccount)?;
6464

6565
Ok(account_id)
6666
}
@@ -379,12 +379,12 @@ where
379379
let from = from_account
380380
.to_string()
381381
.parse()
382-
.map_err(|_| TokenTransferError::ParseAccountFailure)?;
382+
.map_err(|_| TokenTransferError::FailedToParseAccount)?;
383383
let to = self
384384
.get_escrow_account(port_id, channel_id)?
385385
.to_string()
386386
.parse()
387-
.map_err(|_| TokenTransferError::ParseAccountFailure)?;
387+
.map_err(|_| TokenTransferError::FailedToParseAccount)?;
388388
let coins = vec![Coin {
389389
denom: Denom(coin.denom.to_string()),
390390
amount: coin.amount.into(),
@@ -404,11 +404,11 @@ where
404404
.get_escrow_account(port_id, channel_id)?
405405
.to_string()
406406
.parse()
407-
.map_err(|_| TokenTransferError::ParseAccountFailure)?;
407+
.map_err(|_| TokenTransferError::FailedToParseAccount)?;
408408
let to = to_account
409409
.to_string()
410410
.parse()
411-
.map_err(|_| TokenTransferError::ParseAccountFailure)?;
411+
.map_err(|_| TokenTransferError::FailedToParseAccount)?;
412412
let coins = vec![Coin {
413413
denom: Denom(coin.denom.to_string()),
414414
amount: coin.amount.into(),
@@ -425,7 +425,7 @@ where
425425
let account = account
426426
.to_string()
427427
.parse()
428-
.map_err(|_| TokenTransferError::ParseAccountFailure)?;
428+
.map_err(|_| TokenTransferError::FailedToParseAccount)?;
429429
let coins = vec![Coin {
430430
denom: Denom(amt.denom.to_string()),
431431
amount: amt.amount.into(),
@@ -443,7 +443,7 @@ where
443443
let account = account
444444
.to_string()
445445
.parse()
446-
.map_err(|_| TokenTransferError::ParseAccountFailure)?;
446+
.map_err(|_| TokenTransferError::FailedToParseAccount)?;
447447
let coins = vec![Coin {
448448
denom: Denom(amt.denom.to_string()),
449449
amount: amt.amount.into(),

0 commit comments

Comments
 (0)