From 25026c16a897e652b7a193c0e91afc556b5c6c41 Mon Sep 17 00:00:00 2001 From: yito88 Date: Fri, 10 Nov 2023 18:51:41 +0100 Subject: [PATCH] remove unneeded dep --- Cargo.lock | 1 - crates/relayer-cli/Cargo.toml | 2 +- crates/relayer/src/chain/namada.rs | 4 ---- crates/relayer/src/config.rs | 11 +++++++++-- e2e/namada-gaia-simple-transfers | 2 +- e2e/namada-simple-transfers | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9c2efa8f7..c8b894eedf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3147,7 +3147,6 @@ dependencies = [ "ibc-relayer-types", "ibc-telemetry", "itertools 0.10.5", - "namada_sdk", "once_cell", "oneline-eyre", "regex", diff --git a/crates/relayer-cli/Cargo.toml b/crates/relayer-cli/Cargo.toml index 1ac68f64cc..be23988a68 100644 --- a/crates/relayer-cli/Cargo.toml +++ b/crates/relayer-cli/Cargo.toml @@ -45,7 +45,6 @@ hdpath = "0.6.3" http = "0.2" humantime = "2.1" itertools = "0.10.5" -namada_sdk = { git = "https://github.com/anoma/namada", rev = "7116b6aa916026e97f3f871f291c6ba1c7b427d2", features = ["std"] } oneline-eyre = "0.1" regex = "1.9.5" serde = { version = "1.0", features = ["serde_derive"] } @@ -56,6 +55,7 @@ tokio = { version = "1.0", features = ["full"] } tracing = "0.1.36" tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"]} time = "0.3" + [dependencies.tendermint] version = "0.34.0" features = ["secp256k1"] diff --git a/crates/relayer/src/chain/namada.rs b/crates/relayer/src/chain/namada.rs index e282688a09..3834df34ee 100644 --- a/crates/relayer/src/chain/namada.rs +++ b/crates/relayer/src/chain/namada.rs @@ -267,10 +267,6 @@ impl ChainEndpoint for NamadaChain { ) })?; - // TODO Namada health check - - // TODO version check - Ok(HealthCheck::Healthy) } diff --git a/crates/relayer/src/config.rs b/crates/relayer/src/config.rs index 33ef0851b3..d2572e403f 100644 --- a/crates/relayer/src/config.rs +++ b/crates/relayer/src/config.rs @@ -648,8 +648,15 @@ impl ChainConfig { .map(|(key_name, keys)| (key_name, keys.into())) .collect() } - // TODO Namada should use the wallet - ChainConfig::Namada(_) => return Err(keyring::errors::Error::key_not_found()), + ChainConfig::Namada(config) => { + let keyring = + KeyRing::new_namada(Store::Test, &config.id, &config.key_store_folder)?; + keyring + .keys()? + .into_iter() + .map(|(key_name, keys)| (key_name, keys.into())) + .collect() + } }; Ok(keys) } diff --git a/e2e/namada-gaia-simple-transfers b/e2e/namada-gaia-simple-transfers index b31c8af4af..1cca1451e1 100755 --- a/e2e/namada-gaia-simple-transfers +++ b/e2e/namada-gaia-simple-transfers @@ -175,7 +175,7 @@ ${NAMADAC} --base-dir ${base_dir} ibc-transfer \ --node ${NAMADA_LEDGER_ADDR} # wait for relaying -sleep 10 +sleep 15 echo "==== Balances on Namada ====" ${NAMADAC} --base-dir ${base_dir} balance \ diff --git a/e2e/namada-simple-transfers b/e2e/namada-simple-transfers index 1ca51610c7..1737d406d1 100755 --- a/e2e/namada-simple-transfers +++ b/e2e/namada-simple-transfers @@ -190,7 +190,7 @@ ${NAMADAC} --base-dir ${base_dir_b} ibc-transfer \ --node ${LEDGER_ADDR_B} # wait for relaying -sleep 10 +sleep 15 echo "==== Balances on chain A ====" ${NAMADAC} --base-dir ${base_dir_a} balance \