Re-export `v2` submodules (#469)

* Re-export v2::params, error, request and response types

* Use shallow type paths

benches/bench.rs

@@ -6,8 +6,7 @@ use jsonrpsee::{
 	types::traits::SubscriptionClient,
 	types::{
 		traits::Client,
-		v2::params::{Id, ParamsSer},
-		v2::request::RequestSer,
+		v2::{Id, ParamsSer, RequestSer},
 	},
 	ws_client::WsClientBuilder,
 };

examples/weather.rs

@@ -31,7 +31,7 @@
 //! mutation.
 
 use jsonrpsee::{
-	types::{traits::SubscriptionClient, v2::params::ParamsSer},
+	types::{traits::SubscriptionClient, v2::ParamsSer},
 	ws_client::WsClientBuilder,
 	ws_server::RpcModule,
 	ws_server::WsServerBuilder,

examples/ws.rs

@@ -25,7 +25,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use jsonrpsee::{
-	types::{traits::Client, v2::params::ParamsSer},
+	types::{traits::Client, v2::ParamsSer},
 	ws_client::WsClientBuilder,
 	ws_server::{RpcModule, WsServerBuilder},
 };

examples/ws_sub_with_params.rs

@@ -25,7 +25,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use jsonrpsee::{
-	types::{traits::SubscriptionClient, v2::params::ParamsSer},
+	types::{traits::SubscriptionClient, v2::ParamsSer},
 	ws_client::WsClientBuilder,
 	ws_server::{RpcModule, WsServerBuilder},
 };

examples/ws_subscription.rs

@@ -25,7 +25,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 use jsonrpsee::{
-	types::{traits::SubscriptionClient, v2::params::ParamsSer, Error, Subscription},
+	types::{traits::SubscriptionClient, v2::ParamsSer, Error, Subscription},
 	ws_client::WsClientBuilder,
 	ws_server::{RpcModule, WsServerBuilder},
 };

http-client/src/client.rs

@@ -27,12 +27,7 @@
 use crate::transport::HttpTransportClient;
 use crate::types::{
 	traits::Client,
-	v2::{
-		error::RpcError,
-		params::{Id, ParamsSer},
-		request::{NotificationSer, RequestSer},
-		response::Response,
-	},
+	v2::{Id, NotificationSer, ParamsSer, RequestSer, Response, RpcError},
 	Error, TEN_MB_SIZE_BYTES,
 };
 use async_trait::async_trait;

http-client/src/tests.rs

@@ -26,10 +26,7 @@
 
 use crate::types::{
 	traits::Client,
-	v2::{
-		error::{ErrorCode, ErrorObject, RpcError},
-		params::ParamsSer,
-	},
+	v2::{ErrorCode, ErrorObject, ParamsSer, RpcError},
 	Error, JsonValue,
 };
 use crate::HttpClientBuilder;

http-server/src/response.rs

@@ -26,10 +26,7 @@
 
 //! Contains common builders for hyper responses.
 
-use crate::types::v2::{
-	error::{ErrorCode, RpcError},
-	params::{Id, TwoPointZero},
-};
+use crate::types::v2::{ErrorCode, Id, RpcError, TwoPointZero};
 
 const JSON: &str = "application/json; charset=utf-8";
 const TEXT: &str = "text/plain";

http-server/src/server.rs

@@ -35,11 +35,7 @@ use hyper::{
 };
 use jsonrpsee_types::{
 	error::{Error, GenericTransportError},
-	v2::{
-		error::ErrorCode,
-		params::Id,
-		request::{Notification, Request},
-	},
+	v2::{ErrorCode, Id, Notification, Request},
 	TEN_MB_SIZE_BYTES,
 };
 use jsonrpsee_utils::http_helpers::read_body;

tests/tests/integration_tests.rs

@@ -34,7 +34,7 @@ use jsonrpsee::{
 	http_client::HttpClientBuilder,
 	types::{
 		traits::{Client, SubscriptionClient},
-		v2::params::ParamsSer,
+		v2::ParamsSer,
 		Error, JsonValue, Subscription,
 	},
 	ws_client::WsClientBuilder,

types/src/client.rs

@@ -24,7 +24,7 @@
 // IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{error::SubscriptionClosedError, v2::params::SubscriptionId, Error};
+use crate::{error::SubscriptionClosedError, v2::SubscriptionId, Error};
 use core::marker::PhantomData;
 use futures_channel::{mpsc, oneshot};
 use futures_util::{future::FutureExt, sink::SinkExt, stream::StreamExt};

types/src/traits.rs

@@ -24,7 +24,7 @@
 // IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::v2::params::ParamsSer;
+use crate::v2::ParamsSer;
 use crate::{Error, Subscription};
 use async_trait::async_trait;
 use serde::de::DeserializeOwned;

types/src/v2/mod.rs

@@ -34,3 +34,8 @@ pub mod params;
 pub mod request;
 /// JSON-RPC response object related types.
 pub mod response;
+
+pub use error::{ErrorCode, ErrorObject, RpcError};
+pub use params::{Id, Params, ParamsSequence, ParamsSer, SubscriptionId, TwoPointZero};
+pub use request::{InvalidRequest, Notification, NotificationSer, Request, RequestSer};
+pub use response::{Response, SubscriptionPayload, SubscriptionResponse};

utils/src/server/helpers.rs

@@ -27,12 +27,7 @@
 use crate::server::rpc_module::MethodSink;
 use futures_channel::mpsc;
 use futures_util::stream::StreamExt;
-use jsonrpsee_types::v2::{
-	error::{ErrorCode, ErrorObject, RpcError},
-	params::{Id, TwoPointZero},
-	request::InvalidRequest,
-	response::Response,
-};
+use jsonrpsee_types::v2::{ErrorCode, ErrorObject, Id, InvalidRequest, Response, RpcError, TwoPointZero};
 use serde::Serialize;
 
 /// Helper for sending JSON-RPC responses to the client

utils/src/server/rpc_module.rs

@@ -32,10 +32,9 @@ use jsonrpsee_types::{
 	error::{CallError, Error, SubscriptionClosedError},
 	traits::ToRpcParams,
 	v2::{
-		error::{ErrorCode, ErrorObject, CALL_EXECUTION_FAILED_CODE, UNKNOWN_ERROR_CODE},
-		params::{Id, Params, SubscriptionId as RpcSubscriptionId, TwoPointZero},
-		request::Request,
-		response::{Response, SubscriptionPayload, SubscriptionResponse},
+		error::{CALL_EXECUTION_FAILED_CODE, UNKNOWN_ERROR_CODE},
+		ErrorCode, ErrorObject, Id, Params, Request, Response, SubscriptionId as RpcSubscriptionId,
+		SubscriptionPayload, SubscriptionResponse, TwoPointZero,
 	},
 };
 

ws-client/src/client.rs

@@ -27,14 +27,9 @@
 use crate::transport::{Receiver as WsReceiver, Sender as WsSender, Target, WsTransportClientBuilder};
 use crate::types::{
 	traits::{Client, SubscriptionClient},
-	v2::{
-		error::RpcError,
-		params::{Id, ParamsSer},
-		request::{Notification, NotificationSer, RequestSer},
-		response::Response,
-	},
-	BatchMessage, Error, FrontToBack, RegisterNotificationMessage, RequestMessage, Subscription, SubscriptionMessage,
-	TEN_MB_SIZE_BYTES,
+	v2::{Id, Notification, NotificationSer, ParamsSer, RequestSer, Response, RpcError, SubscriptionResponse},
+	BatchMessage, Error, FrontToBack, RegisterNotificationMessage, RequestMessage, Subscription, SubscriptionKind,
+	SubscriptionMessage, TEN_MB_SIZE_BYTES,
 };
 use crate::{
 	helpers::{
@@ -51,10 +46,8 @@ use futures::{
 	prelude::*,
 	sink::SinkExt,
 };
-use jsonrpsee_types::v2::response::SubscriptionResponse;
 use tokio::sync::Mutex;
 
-use jsonrpsee_types::SubscriptionKind;
 use serde::de::DeserializeOwned;
 use std::{
 	borrow::Cow,

ws-client/src/helpers.rs

@@ -27,10 +27,7 @@
 use crate::manager::{RequestManager, RequestStatus};
 use crate::transport::Sender as WsSender;
 use crate::types::v2::{
-	error::RpcError,
-	params::{Id, ParamsSer, SubscriptionId},
-	request::{Notification, RequestSer},
-	response::{Response, SubscriptionResponse},
+	Id, Notification, ParamsSer, RequestSer, Response, RpcError, SubscriptionId, SubscriptionResponse,
 };
 use crate::types::{Error, RequestMessage};
 use futures::channel::{mpsc, oneshot};

ws-client/src/manager.rs

@@ -32,7 +32,7 @@
 //!    > **Note**: The spec allow number, string or null but this crate only supports numbers.
 //!    - SubscriptionId: unique ID generated by server
 
-use crate::types::{v2::params::SubscriptionId, Error, JsonValue};
+use crate::types::{v2::SubscriptionId, Error, JsonValue};
 use fnv::FnvHashMap;
 use futures::channel::{mpsc, oneshot};
 use std::collections::hash_map::{Entry, HashMap};
@@ -308,7 +308,7 @@ impl RequestManager {
 mod tests {
 	use super::{Error, RequestManager};
 	use futures::channel::{mpsc, oneshot};
-	use jsonrpsee_types::v2::params::SubscriptionId;
+	use jsonrpsee_types::v2::SubscriptionId;
 	use serde_json::Value as JsonValue;
 
 	#[test]

ws-client/src/tests.rs

@@ -27,10 +27,7 @@
 #![cfg(test)]
 use crate::types::{
 	traits::{Client, SubscriptionClient},
-	v2::{
-		error::{ErrorCode, ErrorObject, RpcError},
-		params::ParamsSer,
-	},
+	v2::{ErrorCode, ErrorObject, ParamsSer, RpcError},
 	Error, Subscription,
 };
 use crate::WsClientBuilder;

ws-server/src/server.rs

@@ -30,7 +30,11 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 
 use crate::future::{FutureDriver, StopHandle, StopMonitor};
-use crate::types::{error::Error, v2::error::ErrorCode, v2::params::Id, v2::request::Request, TEN_MB_SIZE_BYTES};
+use crate::types::{
+	error::Error,
+	v2::{ErrorCode, Id, Request},
+	TEN_MB_SIZE_BYTES,
+};
 use futures_channel::mpsc;
 use futures_util::io::{BufReader, BufWriter};
 use futures_util::stream::StreamExt;