Skip to content

Commit

Permalink
update ibc-proto-rs to v0.32
Browse files Browse the repository at this point in the history
  • Loading branch information
plafer committed Jun 14, 2023
1 parent 276ea9e commit d92b389
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- Upgrade to tendermint v0.32, ibc-proto-rs v0.31, ics23 v0.10, and get
- Upgrade to tendermint v0.32, ibc-proto-rs v0.32, ics23 v0.10, and get
prehash_key_before_comparison field available for the `ProofSpec`
([#640](https://github.com/cosmos/ibc-rs/issues/640))
4 changes: 2 additions & 2 deletions crates/ibc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ mocks = ["tendermint-testgen", "tendermint/clock", "parking_lot"]

[dependencies]
# Proto definitions for all IBC-related interfaces, e.g., connections or channels.
ibc-proto = { version = "0.31.0", default-features = false }
ibc-proto = { version = "0.32.0", default-features = false }
ics23 = { version = "0.10.1", default-features = false, features = ["host-functions"] }
time = { version = ">=0.3.0, <0.3.23", default-features = false }
serde_derive = { version = "1.0.104", default-features = false, optional = true }
Expand All @@ -71,7 +71,7 @@ dyn-clone = "1.0.8"
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["full"], optional = true }
scale-info = { version = "2.1.2", default-features = false, features = ["derive"], optional = true }
## for borsh encode or decode
borsh = {version = "0.10.0", default-features = false, optional = true }
borsh = {version = "0.9.0", default-features = false, optional = true }
parking_lot = { version = "0.12.1", default-features = false, optional = true }

[dependencies.tendermint]
Expand Down
6 changes: 2 additions & 4 deletions crates/ibc/src/core/ics03_connection/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,8 @@ mod sealed {

#[cfg(feature = "borsh")]
impl borsh::BorshDeserialize for ConnectionEnd {
fn deserialize_reader<R: borsh::maybestd::io::Read>(
reader: &mut R,
) -> borsh::maybestd::io::Result<Self> {
let inner_conn_end = InnerConnectionEnd::deserialize_reader(reader)?;
fn deserialize(reader: &mut &[u8]) -> borsh::maybestd::io::Result<Self> {
let inner_conn_end = InnerConnectionEnd::deserialize(reader)?;
Ok(ConnectionEnd::from(inner_conn_end))
}
}
Expand Down
6 changes: 2 additions & 4 deletions crates/ibc/src/core/timestamp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@ impl borsh::BorshSerialize for Timestamp {

#[cfg(feature = "borsh")]
impl borsh::BorshDeserialize for Timestamp {
fn deserialize_reader<R: borsh::maybestd::io::Read>(
reader: &mut R,
) -> borsh::maybestd::io::Result<Self> {
let timestamp = u64::deserialize_reader(reader)?;
fn deserialize(reader: &mut &[u8]) -> borsh::maybestd::io::Result<Self> {
let timestamp = u64::deserialize(reader)?;
Ok(Timestamp::from_nanoseconds(timestamp)
.map_err(|_| borsh::maybestd::io::ErrorKind::Other)?)
}
Expand Down

0 comments on commit d92b389

Please sign in to comment.