Skip to content

Commit

Permalink
fix according to feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
yito88 committed Nov 26, 2024
1 parent 9161baf commit b8b85b5
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cargo-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-04-21
toolchain: stable
- name: Install Protoc
uses: heliaxdev/setup-protoc@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.76.0"
msrv = "1.79.0"
2 changes: 1 addition & 1 deletion crates/chain-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
keywords = ["cosmos", "ibc", "relayer", "chain", "registry"]
repository = "https://github.com/informalsystems/hermes"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.76.0"
rust-version = "1.79.0"
description = """
Service to fetch data from the chain-registry
"""
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
homepage = "https://hermes.informal.systems/"
repository = "https://github.com/informalsystems/hermes"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.76.0"
rust-version = "1.79.0"
description = """
Hermes is an IBC Relayer written in Rust
"""
Expand Down
4 changes: 2 additions & 2 deletions crates/relayer-cli/src/commands/keys/add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ pub fn add_key(
let mut wallet = CliWalletUtils::new(path.to_path_buf());
wallet
.load()
.map_err(|_| eyre!("error loading Namada wallet"))?;
.map_err(|e| eyre!("error loading Namada wallet: {e}"))?;

let secret_key = wallet
.find_secret_key(key_name, None)
.map_err(|_| eyre!("error loading the key from Namada wallet"))?;
.map_err(|e| eyre!("error loading the key from Namada wallet: {e}"))?;
let address = wallet
.find_address(key_name)
.ok_or_else(|| eyre!("error loading the address from Namada wallet"))?;
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer-rest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme = "README.md"
keywords = ["ibc", "rest", "api", "cosmos", "tendermint"]
homepage = "https://hermes.informal.systems/"
repository = "https://github.com/informalsystems/hermes"
rust-version = "1.76.0"
rust-version = "1.79.0"
description = """
Rust implementation of a RESTful API server for Hermes
"""
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
repository = "https://github.com/informalsystems/hermes"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.76.0"
rust-version = "1.79.0"
description = """
Implementation of the Inter-Blockchain Communication Protocol (IBC).
This crate comprises the main data structures and on-chain logic.
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
repository = "https://github.com/informalsystems/hermes"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.76.0"
rust-version = "1.79.0"
description = """
Implementation of an IBC Relayer in Rust, as a library
"""
Expand Down
2 changes: 1 addition & 1 deletion crates/telemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"
keywords = ["cosmos", "ibc", "relayer", "telemetry"]
repository = "https://github.com/informalsystems/hermes"
authors = ["Informal Systems <hello@informal.systems>"]
rust-version = "1.76.0"
rust-version = "1.79.0"
description = """
Telemetry service for the Hermes IBC relayer
"""
Expand Down
2 changes: 1 addition & 1 deletion tools/integration-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "ibc-integration-test"
version = "0.29.4"
edition = "2021"
rust-version = "1.76.0"
rust-version = "1.79.0"
license = "Apache-2.0"
readme = "README.md"
keywords = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
Expand Down
1 change: 0 additions & 1 deletion tools/test-framework/src/bootstrap/namada.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ pub fn bootstrap_namada_node(

let args: Vec<&str> = base_args.to_vec();

//let mut child = Command::new(&chain_driver.command_path)
let mut child = Command::new("namadan")
.args(&args)
.stdin(Stdio::null())
Expand Down
1 change: 0 additions & 1 deletion tools/test-framework/src/chain/cli/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ pub fn query_namada_balance(
) -> Result<Amount, Error> {
let output = simple_exec(
chain_id,
//command_path,
"namadac",
&[
"--base-dir",
Expand Down
6 changes: 3 additions & 3 deletions tools/test-framework/src/chain/config/namada.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub fn set_p2p_port(config: &mut Value, port: u16) -> Result<(), Error> {
.get_mut("cometbft")
.ok_or_else(|| eyre!("expect cometbft section"))?
.get_mut("p2p")
.ok_or_else(|| eyre!("expect cometbft rpc"))?
.ok_or_else(|| eyre!("expect cometbft p2p"))?
.as_table_mut()
.ok_or_else(|| eyre!("expect object"))?
.insert(
Expand All @@ -39,7 +39,7 @@ pub fn set_p2p_port(config: &mut Value, port: u16) -> Result<(), Error> {
Ok(())
}

/// Set the `p2p` field in the full node config.
/// Set the `proxy_app` field in the full node config.
pub fn set_proxy_app_port(config: &mut Value, port: u16) -> Result<(), Error> {
config
.get_mut("ledger")
Expand All @@ -56,7 +56,7 @@ pub fn set_proxy_app_port(config: &mut Value, port: u16) -> Result<(), Error> {
Ok(())
}

/// Set the `p2p` field in the full node config.
/// Set the `block_cache_bytes` field in the full node config.
pub fn set_block_cache_bytes(config: &mut Value, block_cache_bytes: i64) -> Result<(), Error> {
config
.get_mut("ledger")
Expand Down
1 change: 0 additions & 1 deletion tools/test-framework/src/relayer/transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ pub async fn ibc_token_transfer<SrcChain, DstChain>(
})
.ok_or_else(|| eyre!("failed to find send packet event"))?;

//Ok(packet)
Ok(())
}

Expand Down

0 comments on commit b8b85b5

Please sign in to comment.