Make zebra-rpc use the new state ReadRequest

ZcashFoundation · Mar 15, 2022 · 945bf42 · 945bf42
1 parent a1eda17
commit 945bf42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/zebra-rpc/src/methods.rs b/zebra-rpc/src/methods.rs
@@ -110,8 +110,8 @@ pub struct RpcImpl<Mempool, State, Tip>
 where
     Mempool: Service<mempool::Request, Response = mempool::Response, Error = BoxError>,
     State: Service<
-        zebra_state::Request,
-        Response = zebra_state::Response,
+        zebra_state::ReadRequest,
+        Response = zebra_state::ReadResponse,
         Error = zebra_state::BoxError,
     >,
     Tip: ChainTip,
@@ -137,8 +137,8 @@ impl<Mempool, State, Tip> RpcImpl<Mempool, State, Tip>
 where
     Mempool: Service<mempool::Request, Response = mempool::Response, Error = BoxError>,
     State: Service<
-        zebra_state::Request,
-        Response = zebra_state::Response,
+        zebra_state::ReadRequest,
+        Response = zebra_state::ReadResponse,
         Error = zebra_state::BoxError,
     >,
     Tip: ChainTip + Send + Sync,
@@ -170,8 +170,8 @@ where
         tower::Service<mempool::Request, Response = mempool::Response, Error = BoxError> + 'static,
     Mempool::Future: Send,
     State: Service<
-            zebra_state::Request,
-            Response = zebra_state::Response,
+            zebra_state::ReadRequest,
+            Response = zebra_state::ReadResponse,
             Error = zebra_state::BoxError,
         > + Clone
         + Send
@@ -257,7 +257,8 @@ where
                 data: None,
             })?;
 
-            let request = zebra_state::Request::Block(zebra_state::HashOrHeight::Height(height));
+            let request =
+                zebra_state::ReadRequest::Block(zebra_state::HashOrHeight::Height(height));
             let response = state
                 .ready()
                 .and_then(|service| service.call(request))
@@ -269,8 +270,8 @@ where
                 })?;
 
             match response {
-                zebra_state::Response::Block(Some(block)) => Ok(GetBlock(block.into())),
-                zebra_state::Response::Block(None) => Err(Error {
+                zebra_state::ReadResponse::Block(Some(block)) => Ok(GetBlock(block.into())),
+                zebra_state::ReadResponse::Block(None) => Err(Error {
                     code: ErrorCode::ServerError(0),
                     message: "Block not found".to_string(),
                     data: None,

diff --git a/zebra-rpc/src/server.rs b/zebra-rpc/src/server.rs
@@ -44,8 +44,8 @@ impl RpcServer {
             + 'static,
         Mempool::Future: Send,
         State: Service<
-                zebra_state::Request,
-                Response = zebra_state::Response,
+                zebra_state::ReadRequest,
+                Response = zebra_state::ReadResponse,
                 Error = zebra_state::BoxError,
             > + Clone
             + Send