make method for retrieving validators in rpc client async too

and some minor changes due to rebasing on master
informalsystems · Dec 12, 2019 · 904f9aa · 904f9aa
1 parent b6543c0
commit 904f9aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/tendermint/src/rpc/client.rs b/tendermint/src/rpc/client.rs
@@ -118,11 +118,11 @@ impl Client {
     }
 
     /// `/validators`: get validators a given height.
-    pub fn validators<H>(&self, height: H) -> Result<validators::Response, Error>
+    pub async fn validators<H>(&self, height: H) -> Result<validators::Response, Error>
     where
         H: Into<Height>,
     {
-        self.perform(validators::Request::new(height.into()))
+        self.perform(validators::Request::new(height.into())).await
     }
 
     /// `/commit`: get the latest block commit

diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
@@ -1,5 +1,6 @@
 //! Tendermint validators
 
+use crate::amino_types::message::AminoMessage;
 use crate::{account, lite, merkle, vote, Hash, PublicKey};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use signatory::{

diff --git a/tendermint/tests/rpc.rs b/tendermint/tests/rpc.rs
@@ -58,7 +58,7 @@ mod endpoints {
     #[test]
     fn first_block() {
         let response =
-            endpoint::block::Response::from_json(&read_json_fixture("first_block")).unwrap();
+            endpoint::block::Response::from_string(&read_json_fixture("first_block")).unwrap();
 
         let tendermint::Block {
             header,