feature: send batch request

crates/transports/src/batch.rs

@@ -12,12 +12,13 @@ use tower::Service;
 
 use crate::{
     error::{RpcResult, TransportError},
-    types::{Id, JsonRpcRequest, JsonRpcResponse, RpcReturn},
+    rpc_types::{Id, JsonRpcRequest, JsonRpcResponse, RpcReturn},
 };
 
 type Channel = oneshot::Sender<RpcResult<Box<RawValue>, TransportError>>;
 type ChannelMap = HashMap<Id, Channel>;
 
+/// A Batch JSON-RPC request, awaiting dispatch.
 #[derive(Debug, Default)]
 pub struct BatchRequest<T> {
     transport: T,
@@ -27,6 +28,7 @@ pub struct BatchRequest<T> {
     channels: ChannelMap,
 }
 
+/// Awaits a single response for a request that has been included in a batch.
 pub struct Waiter<Resp> {
     rx: oneshot::Receiver<RpcResult<Box<RawValue>, TransportError>>,
     _resp: PhantomData<Resp>,
@@ -84,9 +86,15 @@ impl<T> BatchRequest<T> {
         self.requests.push(request);
         rx
     }
+}
 
-    pub fn decompose(self) -> (Vec<JsonRpcRequest>, ChannelMap) {
-        (self.requests, self.channels)
+impl<T> BatchRequest<T>
+where
+    T: Service<Vec<JsonRpcRequest>, Response = Vec<JsonRpcResponse>, Error = TransportError>,
+{
+    /// Send the batch future via its connection.
+    pub fn send(self) -> BatchFuture<T> {
+        BatchFuture::Prepared(self)
     }
 }
 

crates/transports/src/call.rs

@@ -9,7 +9,7 @@ use tower::Service;
 
 use crate::{
     error::{RpcResult, TransportError},
-    types::{JsonRpcRequest, JsonRpcResponse, RpcParam, RpcReturn},
+    rpc_types::{JsonRpcRequest, JsonRpcResponse, RpcParam, RpcReturn},
 };
 
 #[pin_project::pin_project(project = CallStateProj)]

crates/transports/src/connection.rs

@@ -2,7 +2,7 @@ use crate::{
     batch::BatchRequest,
     call::RpcCall,
     error::TransportError,
-    types::{Id, JsonRpcRequest, JsonRpcResponse, RpcParam, RpcReturn},
+    rpc_types::{Id, JsonRpcRequest, JsonRpcResponse, RpcParam, RpcReturn},
     utils::to_json_raw_value,
 };
 
@@ -79,6 +79,6 @@ mod test {
     fn basic_instantiation() {
         let h: RpcClient<Http<reqwest::Client>> = "http://localhost:8545".parse().unwrap();
 
-        assert_eq!(h.is_local(), true);
+        assert!(h.is_local());
     }
 }

crates/transports/src/error.rs

@@ -1,4 +1,4 @@
-use crate::types::{ErrorPayload, JsonRpcResponse, ResponsePayload, RpcReturn};
+use crate::rpc_types::{ErrorPayload, JsonRpcResponse, ResponsePayload, RpcReturn};
 
 use serde_json::value::RawValue;
 use std::{error::Error as StdError, fmt::Debug};

crates/transports/src/lib.rs

@@ -1,9 +1,21 @@
-pub mod call;
-pub mod common;
+mod call;
+pub use call::RpcCall;
+
+mod common;
+pub use common::Authorization;
+
 pub mod connection;
-pub mod error;
-pub mod utils;
+pub use connection::RpcClient;
+
+mod error;
+pub use error::{RpcResult, TransportError};
+
+pub(crate) mod utils;
+
+mod batch;
+pub use batch::BatchRequest;
+
+mod transports;
+pub use transports::Http;
 
-pub mod batch;
-pub mod transports;
-pub mod types;
+pub mod rpc_types;

crates/transports/src/transports/http.rs

@@ -6,7 +6,7 @@ use tower::Service;
 use crate::{
     connection::RpcClient,
     error::TransportError,
-    types::{JsonRpcRequest, JsonRpcResponse},
+    rpc_types::{JsonRpcRequest, JsonRpcResponse},
 };
 
 impl<T> RpcClient<Http<T>>

crates/transports/src/transports/mod.rs

@@ -1 +1,2 @@
 pub mod http;
+pub use http::Http;