Fix block-related queries to use compat mode

rpc/src/client/transport/http.rs

@@ -257,6 +257,24 @@ impl Client for HttpClient {
         self.perform_with_dialect(request, LatestDialect).await
     }
 
+    async fn block<H>(&self, height: H) -> Result<endpoint::block::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        perform_with_compat!(self, endpoint::block::Request::new(height.into()))
+    }
+
+    async fn block_by_hash(
+        &self,
+        hash: tendermint::Hash,
+    ) -> Result<endpoint::block_by_hash::Response, Error> {
+        perform_with_compat!(self, endpoint::block_by_hash::Request::new(hash))
+    }
+
+    async fn latest_block(&self) -> Result<endpoint::block::Response, Error> {
+        perform_with_compat!(self, endpoint::block::Request::default())
+    }
+
     async fn block_results<H>(&self, height: H) -> Result<endpoint::block_results::Response, Error>
     where
         H: Into<Height> + Send,
@@ -268,6 +286,19 @@ impl Client for HttpClient {
         perform_with_compat!(self, endpoint::block_results::Request::default())
     }
 
+    async fn block_search(
+        &self,
+        query: Query,
+        page: u32,
+        per_page: u8,
+        order: Order,
+    ) -> Result<endpoint::block_search::Response, Error> {
+        perform_with_compat!(
+            self,
+            endpoint::block_search::Request::new(query, page, per_page, order)
+        )
+    }
+
     async fn header<H>(&self, height: H) -> Result<endpoint::header::Response, Error>
     where
         H: Into<Height> + Send,

rpc/src/client/transport/websocket.rs

@@ -234,6 +234,24 @@ impl Client for WebSocketClient {
         self.perform_with_dialect(request, LatestDialect).await
     }
 
+    async fn block<H>(&self, height: H) -> Result<endpoint::block::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        perform_with_compat!(self, endpoint::block::Request::new(height.into()))
+    }
+
+    async fn block_by_hash(
+        &self,
+        hash: tendermint::Hash,
+    ) -> Result<endpoint::block_by_hash::Response, Error> {
+        perform_with_compat!(self, endpoint::block_by_hash::Request::new(hash))
+    }
+
+    async fn latest_block(&self) -> Result<endpoint::block::Response, Error> {
+        perform_with_compat!(self, endpoint::block::Request::default())
+    }
+
     async fn block_results<H>(&self, height: H) -> Result<endpoint::block_results::Response, Error>
     where
         H: Into<Height> + Send,
@@ -245,6 +263,19 @@ impl Client for WebSocketClient {
         perform_with_compat!(self, endpoint::block_results::Request::default())
     }
 
+    async fn block_search(
+        &self,
+        query: Query,
+        page: u32,
+        per_page: u8,
+        order: Order,
+    ) -> Result<endpoint::block_search::Response, Error> {
+        perform_with_compat!(
+            self,
+            endpoint::block_search::Request::new(query, page, per_page, order)
+        )
+    }
+
     async fn header<H>(&self, height: H) -> Result<endpoint::header::Response, Error>
     where
         H: Into<Height> + Send,

rpc/src/endpoint/block.rs

@@ -3,7 +3,7 @@
 use serde::{Deserialize, Serialize};
 use tendermint::block::{self, Block};
 
-use crate::dialect;
+use crate::dialect::{self, Dialect};
 use crate::request::RequestMessage;
 
 /// Get information about a specific block
@@ -34,24 +34,20 @@ impl crate::Request<dialect::v0_34::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<dialect::v0_34::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<dialect::v0_37::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<dialect::v0_37::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<dialect::v0_38::Dialect> for Request {
-    type Response = Response;
+    type Response = self::v0_38::DialectResponse;
 }
 
-impl crate::SimpleRequest<dialect::v0_38::Dialect> for Request {
-    type Output = Response;
+impl<S: Dialect> crate::SimpleRequest<S> for Request
+where
+    Self: crate::Request<S>,
+    Response: From<Self::Response>,
+{
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 /// Block responses
@@ -66,7 +62,7 @@ pub struct Response {
 
 impl crate::Response for Response {}
 
-pub mod v_038 {
+pub mod v0_38 {
     use std::vec::Vec;
 
     use block::{Commit, Header};

rpc/src/endpoint/block_by_hash.rs

@@ -6,7 +6,7 @@ use tendermint::{
     Hash,
 };
 
-use crate::dialect;
+use crate::dialect::{self, Dialect};
 use crate::request::RequestMessage;
 
 /// Get information about a specific block by its hash
@@ -43,24 +43,20 @@ impl crate::Request<dialect::v0_34::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<dialect::v0_34::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<dialect::v0_37::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<dialect::v0_37::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<dialect::v0_38::Dialect> for Request {
-    type Response = Response;
+    type Response = self::v0_38::DialectResponse;
 }
 
-impl crate::SimpleRequest<dialect::v0_38::Dialect> for Request {
-    type Output = Response;
+impl<S: Dialect> crate::SimpleRequest<S> for Request
+where
+    Self: crate::Request<S>,
+    Response: From<Self::Response>,
+{
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 /// Block responses
@@ -75,9 +71,9 @@ pub struct Response {
 
 impl crate::Response for Response {}
 
-pub mod v_038 {
+pub mod v0_38 {
     use super::*;
-    use crate::endpoint::block::v_038::DialectBlock;
+    use crate::endpoint::block::v0_38::DialectBlock;
 
     #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct DialectResponse {

rpc/src/endpoint/block_results.rs

@@ -49,7 +49,7 @@ where
     Self: crate::Request<S>,
     Response: From<Self::Response>,
 {
-    type Output = Response;
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 /// ABCI result response.

rpc/src/endpoint/block_search.rs

@@ -3,6 +3,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::dialect;
+use crate::dialect::Dialect;
 use crate::prelude::*;
 use crate::request::RequestMessage;
 use crate::serializers;
@@ -43,24 +44,20 @@ impl crate::Request<dialect::v0_34::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<dialect::v0_34::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<dialect::v0_37::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<dialect::v0_37::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<dialect::v0_38::Dialect> for Request {
-    type Response = Response;
+    type Response = self::v0_38::DialectResponse;
 }
 
-impl crate::SimpleRequest<dialect::v0_38::Dialect> for Request {
-    type Output = Response;
+impl<S: Dialect> crate::SimpleRequest<S> for Request
+where
+    Self: crate::Request<S>,
+    Response: From<Self::Response>,
+{
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -77,7 +74,7 @@ pub mod v0_38 {
 
     #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct DialectResponse {
-        pub blocks: Vec<block::v_038::DialectResponse>,
+        pub blocks: Vec<block::v0_38::DialectResponse>,
 
         #[serde(with = "serializers::from_str")]
         pub total_count: u32,

rpc/src/endpoint/header.rs

@@ -3,7 +3,7 @@
 use serde::{Deserialize, Serialize};
 use tendermint::block::{self, Header};
 
-use crate::dialect::{v0_37, v0_38};
+use crate::dialect::{v0_37, v0_38, Dialect};
 use crate::request::RequestMessage;
 
 /// Get information about a specific block
@@ -34,16 +34,16 @@ impl crate::Request<v0_37::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<v0_37::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<v0_38::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<v0_38::Dialect> for Request {
-    type Output = Response;
+impl<S: Dialect> crate::SimpleRequest<S> for Request
+where
+    Self: crate::Request<S>,
+    Response: From<Self::Response>,
+{
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 /// Header response

rpc/src/endpoint/header_by_hash.rs

@@ -3,7 +3,7 @@
 use serde::{Deserialize, Serialize};
 use tendermint::{block::Header, Hash};
 
-use crate::dialect::{v0_37, v0_38};
+use crate::dialect::{v0_37, v0_38, Dialect};
 use crate::request::RequestMessage;
 
 /// Get information about a specific block by its hash
@@ -40,16 +40,16 @@ impl crate::Request<v0_37::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<v0_37::Dialect> for Request {
-    type Output = Response;
-}
-
 impl crate::Request<v0_38::Dialect> for Request {
     type Response = Response;
 }
 
-impl crate::SimpleRequest<v0_38::Dialect> for Request {
-    type Output = Response;
+impl<S: Dialect> crate::SimpleRequest<S> for Request
+where
+    Self: crate::Request<S>,
+    Response: From<Self::Response>,
+{
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 /// Header response

rpc/src/endpoint/tx.rs

@@ -50,7 +50,7 @@ where
     Self: crate::Request<S>,
     Response: From<Self::Response>,
 {
-    type Output = Response;
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]

rpc/src/endpoint/tx_search.rs

@@ -65,7 +65,7 @@ where
     Self: crate::Request<S>,
     Response: From<Self::Response>,
 {
-    type Output = Response;
+    type Output = <Self as crate::Request<S>>::Response;
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]