Minor fixes as follow-up from #364

informalsystems · Nov 26, 2020 · ba30310 · ba30310
1 parent 53f97f6
commit ba30310
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/relayer/src/chain/cosmos.rs b/relayer/src/chain/cosmos.rs
@@ -64,12 +64,8 @@ pub struct CosmosSDKChain {
 
 impl CosmosSDKChain {
     pub fn from_config(config: ChainConfig, rt: Arc<Mutex<TokioRuntime>>) -> Result<Self, Error> {
-        let primary = config
-            .primary()
-            .ok_or_else(|| Kind::LightClient.context("no primary peer specified"))?;
-
         let rpc_client =
-            HttpClient::new(primary.address.clone()).map_err(|e| Kind::Rpc.context(e))?;
+            HttpClient::new(config.rpc_addr.clone()).map_err(|e| Kind::Rpc.context(e))?;
 
         // Initialize key store and load key
         let key_store = KeyRing::init(StoreBackend::Test, config.clone())

diff --git a/relayer/src/chain/runtime.rs b/relayer/src/chain/runtime.rs
@@ -61,7 +61,7 @@ pub struct ChainRuntime<C: Chain> {
     light_client: Box<dyn LightClient<C>>,
 
     #[allow(dead_code)]
-    rt: Arc<Mutex<TokioRuntime>>,
+    rt: Arc<Mutex<TokioRuntime>>, // Making this future-proof, so we keep the runtime around.
 }
 
 impl ChainRuntime<CosmosSDKChain> {
@@ -96,7 +96,7 @@ impl ChainRuntime<CosmosSDKChain> {
         // Spawn the event monitor
         let event_monitor_thread = thread::spawn(move || event_monitor.run());
 
-        // Initialize the source and destination chain runtimes
+        // Initialize the chain runtime
         let chain_runtime = Self::cosmos_sdk(config, light_client, event_receiver, rt)?;
 
         // Get a handle to the runtime

diff --git a/relayer/src/light_client/tendermint.rs b/relayer/src/light_client/tendermint.rs
@@ -100,8 +100,6 @@ fn build_instance(
 }
 
 fn build_supervisor(config: &ChainConfig, reset: bool) -> Result<Supervisor, error::Error> {
-    let _id = config.id.clone();
-
     let options = light_client::Options {
         trust_threshold: config.trust_threshold,
         trusting_period: config.trusting_period,