Crate restructuring

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 	"jsonrpsee",
 	"tests",
 	"types",
-	"utils",
+	"core",
 	"ws-client",
 	"ws-server",
 	"proc-macros",

benches/bench.rs

@@ -1,16 +1,12 @@
+use std::sync::Arc;
+
 use criterion::*;
 use futures_util::future::join_all;
 use helpers::{SUB_METHOD_NAME, UNSUB_METHOD_NAME};
-use jsonrpsee::{
-	http_client::HttpClientBuilder,
-	types::traits::SubscriptionClient,
-	types::{
-		traits::Client,
-		v2::{Id, ParamsSer, RequestSer},
-	},
-	ws_client::WsClientBuilder,
-};
-use std::sync::Arc;
+use jsonrpsee::core::traits::{Client, SubscriptionClient};
+use jsonrpsee::http_client::HttpClientBuilder;
+use jsonrpsee::types::{Id, ParamsSer, RequestSer};
+use jsonrpsee::ws_client::WsClientBuilder;
 use tokio::runtime::Runtime as TokioRuntime;
 
 mod helpers;

benches/helpers.rs

@@ -26,10 +26,11 @@ pub async fn http_server(handle: tokio::runtime::Handle) -> (String, jsonrpc_htt
 /// Run jsonrpc WebSocket server for benchmarks.
 #[cfg(feature = "jsonrpc-crate")]
 pub async fn ws_server(handle: tokio::runtime::Handle) -> (String, jsonrpc_ws_server::Server) {
+	use std::sync::atomic::{AtomicU64, Ordering};
+
 	use jsonrpc_pubsub::{PubSubHandler, Session, Subscriber, SubscriptionId};
 	use jsonrpc_ws_server::jsonrpc_core::*;
 	use jsonrpc_ws_server::*;
-	use std::sync::atomic::{AtomicU64, Ordering};
 
 	const ID: AtomicU64 = AtomicU64::new(0);
 

utils/Cargo.toml → core/Cargo.toml

@@ -1,44 +1,42 @@
 [package]
-name = "jsonrpsee-utils"
+name = "jsonrpsee-core"
 version = "0.6.0"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Utilities for jsonrpsee"
 edition = "2018"
 license = "MIT"
 
 [dependencies]
+anyhow = "1"
 arrayvec = "0.7.1"
+async-trait = "0.1"
 beef = { version = "0.5.1", features = ["impl_serde"] }
-thiserror = { version = "1", optional = true }
-futures-channel = { version = "0.3.14", default-features = false, optional = true }
+thiserror = "1"
+futures-channel = { version = "0.3.14", default-features = false }
 futures-util = { version = "0.3.14", default-features = false, optional = true }
-hyper = { version = "0.14.10", default-features = false, features = ["stream"], optional = true }
-jsonrpsee-types = { path = "../types", version = "0.6.0", optional = true }
+hyper = { version = "0.14.10", default-features = false, features = ["stream"] }
+jsonrpsee-types = { path = "../types", version = "0.6.0" }
 tracing = { version = "0.1", optional = true }
 rustc-hash = { version = "1", optional = true }
 rand = { version = "0.8", optional = true }
-serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
-serde_json = { version = "1", features = ["raw_value"], optional = true }
+serde = { version = "1.0", default-features = false, features = ["derive"] }
+serde_json = { version = "1", features = ["raw_value"] }
+soketto = "0.7.1"
 parking_lot = { version = "0.11", optional = true }
 tokio = { version = "1.8", features = ["rt"], optional = true }
 
 [features]
 default = []
-http-helpers = ["hyper", "futures-util", "jsonrpsee-types"]
+http-helpers = ["futures-util"]
 server = [
-	"thiserror",
-	"futures-channel",
 	"futures-util",
-	"jsonrpsee-types",
 	"rustc-hash",
-	"serde",
-	"serde_json",
 	"tracing",
 	"parking_lot",
 	"rand",
 	"tokio",
 ]
-client = ["jsonrpsee-types"]
+client = ["futures-util"]
 
 [dev-dependencies]
 serde_json = "1.0"

types/src/client.rs → core/src/client.rs

@@ -24,21 +24,45 @@
 // IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{error::SubscriptionClosed, v2::SubscriptionId, Error};
-use core::marker::PhantomData;
-use futures_channel::{mpsc, oneshot};
-use futures_util::{
-	future::FutureExt,
-	sink::SinkExt,
-	stream::{Stream, StreamExt},
-};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use serde_json::Value as JsonValue;
+//! Shared utilities for `jsonrpsee` clients.
 use std::pin::Pin;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
 use std::task;
 
+use crate::error::{Error, SubscriptionClosed};
+use core::marker::PhantomData;
+use futures_channel::{mpsc, oneshot};
+use futures_util::future::FutureExt;
+use futures_util::sink::SinkExt;
+use futures_util::stream::{Stream, StreamExt};
+use jsonrpsee_types::SubscriptionId;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde_json::Value as JsonValue;
+
+#[doc(hidden)]
+pub mod __reexports {
+	pub use crate::to_json_value;
+	pub use jsonrpsee_types::ParamsSer;
+}
+
+#[macro_export]
+/// Convert the given values to a [`jsonrpsee_types::ParamsSer`] as expected by a jsonrpsee Client (http or websocket).
+macro_rules! rpc_params {
+	($($param:expr),*) => {
+		{
+			let mut __params = vec![];
+			$(
+				__params.push($crate::client::__reexports::to_json_value($param).expect("json serialization is infallible; qed."));
+			)*
+			Some($crate::client::__reexports::ParamsSer::Array(__params))
+		}
+	};
+	() => {
+		None
+	}
+}
+
 /// Subscription kind
 #[derive(Debug)]
 #[non_exhaustive]