Changes for the tendermint dep rebase (informalsystems#437)

* Changes for the tendermint dep rebase

* error format

* Changes for integration with tm pr#706

* remove event_monitor.rs file

Cargo.toml

@@ -16,4 +16,5 @@ exclude = [
 tendermint              = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/skip-verif" }
 tendermint-rpc          = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/skip-verif" }
 tendermint-proto        = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/skip-verif" }
-tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/skip-verif" }
+tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/skip-verif" }
+tendermint-testgen = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/skip-verif" }

relayer/src/chain/cosmos.rs

@@ -1,4 +1,4 @@
-use std::convert::{TryFrom, TryInto};
+use std::convert::TryFrom;
 use std::future::Future;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
@@ -19,7 +19,7 @@ use tendermint::account::Id as AccountId;
 use tendermint::block::Height;
 use tendermint::consensus::Params;
 
-use tendermint_light_client::types::{LightBlock as TMLightBlock, ValidatorSet};
+use tendermint_light_client::types::LightBlock as TMLightBlock;
 use tendermint_rpc::Client;
 use tendermint_rpc::HttpClient;
 
@@ -376,8 +376,8 @@ impl Chain for CosmosSDKChain {
         Ok(TMHeader {
             trusted_height,
             signed_header: target_light_block.signed_header.clone(),
-            validator_set: fix_validator_set(&target_light_block)?,
-            trusted_validator_set: fix_validator_set(&trusted_light_block)?,
+            validator_set: target_light_block.validators,
+            trusted_validator_set: trusted_light_block.validators,
         })
     }
 
@@ -411,28 +411,6 @@ impl Chain for CosmosSDKChain {
     }
 }
 
-fn fix_validator_set(light_block: &TMLightBlock) -> Result<ValidatorSet, Error> {
-    let validators = light_block.validators.validators();
-    // Get the proposer.
-    let proposer = validators
-        .iter()
-        .find(|v| v.address == light_block.signed_header.header.proposer_address)
-        .ok_or(Kind::EmptyResponseValue)?;
-
-    let voting_power: u64 = validators.iter().map(|v| v.voting_power.value()).sum();
-
-    // Create the validator set with the proposer from the header.
-    // This is required by IBC on-chain validation.
-    let validator_set = ValidatorSet::new(
-        validators.clone(),
-        Some(*proposer),
-        voting_power
-            .try_into()
-            .map_err(|e| Kind::EmptyResponseValue.context(e))?,
-    );
-    Ok(validator_set)
-}
-
 /// Perform a generic `abci_query`, and return the corresponding deserialized response data.
 async fn abci_query(
     chain: &CosmosSDKChain,

relayer/src/event/monitor.rs

@@ -134,11 +134,9 @@ impl EventMonitor {
         // Shut down previous client
         debug!("Gracefully shutting down previous client");
 
-        self.rt
-            .lock()
-            .map_err(|_| Kind::PoisonedMutex)?
-            .block_on(websocket_client.close())
-            .map_err(|e| format!("Failed to close previous WebSocket client: {}", e))?;
+        if let Err(e) = websocket_client.close() {
+            error!("Previous websocket client closing failure {}", e);
+        }
 
         self.rt
             .lock()