[proc macros]: support generic type params

examples/proc_macro.rs

@@ -28,32 +28,30 @@ use jsonrpsee::{
 	proc_macros::rpc,
 	types::{async_trait, error::Error},
 	ws_client::WsClientBuilder,
-	ws_server::{RpcModule, SubscriptionSink, WsServerBuilder},
+	ws_server::{SubscriptionSink, WsServerBuilder},
 };
+use serde::de::DeserializeOwned;
+use serde::ser::Serialize;
 use std::net::SocketAddr;
 
 #[rpc(server, client, namespace = "state")]
-pub trait Rpc {
+pub trait Rpc<
+	Hash: DeserializeOwned + Serialize + Send + Sync + 'static,
+	Prefix: DeserializeOwned + Serialize + Send + Sync + 'static,
+>
+{
 	/// Async method call example.
 	#[method(name = "getPairs")]
-	async fn storage_pairs(&self, prefix: usize, hash: Option<u128>) -> Result<Vec<usize>, Error>;
-
-	/// Subscription that take `Option<Vec<u8>>` as input and produces output `Vec<usize>`.
-	#[subscription(name = "subscribeStorage", unsub = "unsubscribeStorage", item = Vec<usize>)]
-	fn subscribe_storage(&self, keys: Option<Vec<u8>>);
+	async fn storage_pairs(&self, prefix: Prefix, hash: Hash) -> Result<Vec<usize>, Error>;
 }
 
 pub struct RpcServerImpl;
 
 #[async_trait]
-impl RpcServer for RpcServerImpl {
-	async fn storage_pairs(&self, _prefix: usize, _hash: Option<u128>) -> Result<Vec<usize>, Error> {
+impl RpcServer<Vec<u8>, usize> for RpcServerImpl {
+	async fn storage_pairs(&self, _prefix: usize, _hash: Vec<u8>) -> Result<Vec<usize>, Error> {
 		Ok(vec![1, 2, 3, 4])
 	}
-
-	fn subscribe_storage(&self, mut sink: SubscriptionSink, keys: Option<Vec<u8>>) {
-		sink.send(&keys.unwrap_or_default()).unwrap();
-	}
 }
 
 #[tokio::main]
@@ -64,18 +62,13 @@ async fn main() -> anyhow::Result<()> {
 	let url = format!("ws://{}", server_addr);
 
 	let client = WsClientBuilder::default().build(&url).await?;
-	assert_eq!(client.storage_pairs(10, None).await.unwrap(), vec![1, 2, 3, 4]);
-
-	let mut sub = client.subscribe_storage(None).await.unwrap();
-	assert_eq!(Some(vec![]), sub.next().await.unwrap());
+	assert_eq!(client.storage_pairs(10, vec![1, 2, 3, 4]).await.unwrap(), vec![1, 2, 3, 4]);
 
 	Ok(())
 }
 
 async fn run_server() -> anyhow::Result<SocketAddr> {
 	let server = WsServerBuilder::default().build("127.0.0.1:0").await?;
-	let mut module = RpcModule::new(());
-	module.register_method("state_getPairs", |_, _| Ok(vec![1, 2, 3]))?;
 
 	let addr = server.local_addr()?;
 	tokio::spawn(async move { server.start(RpcServerImpl.into_rpc()).await });

proc-macros/src/new/render_client.rs

@@ -7,6 +7,14 @@ impl RpcDescription {
 		let jsonrpsee = self.jsonrpsee_client_path.as_ref().unwrap();
 
 		let trait_name = quote::format_ident!("{}Client", &self.trait_def.ident);
+		let generics = self.trait_def.generics.clone();
+
+		let mut type_idents = Vec::new();
+		for param in generics.type_params() {
+			type_idents.push(param);
+		}
+
+		let (_, type_generics, where_clause) = generics.split_for_impl();
 
 		let super_trait = if self.subscriptions.is_empty() {
 			quote! { #jsonrpsee::types::traits::Client }
@@ -26,12 +34,12 @@ impl RpcDescription {
 		let trait_impl = quote! {
 			#[#async_trait]
 			#[doc = #doc_comment]
-			pub trait #trait_name: #super_trait {
+			pub trait #trait_name #generics: #super_trait {
 				#(#method_impls)*
 				#(#sub_impls)*
 			}
 
-			impl<T> #trait_name for T where T: #super_trait {}
+			impl<T #(,#type_idents)*> #trait_name #type_generics for T where T: #super_trait {}
 		};
 
 		Ok(trait_impl)

proc-macros/src/new/render_server.rs

@@ -7,6 +7,7 @@ use std::collections::HashSet;
 impl RpcDescription {
 	pub(super) fn render_server(&self) -> Result<TokenStream2, syn::Error> {
 		let trait_name = quote::format_ident!("{}Server", &self.trait_def.ident);
+		let generics = self.trait_def.generics.clone();
 
 		let method_impls = self.render_methods()?;
 		let into_rpc_impl = self.render_into_rpc()?;
@@ -19,7 +20,7 @@ impl RpcDescription {
 		let trait_impl = quote! {
 			#[#async_trait]
 			#[doc = #doc_comment]
-			pub trait #trait_name: Sized + Send + Sync + 'static {
+			pub trait #trait_name #generics: Sized + Send + Sync + 'static {
 				#method_impls
 				#into_rpc_impl
 			}
@@ -176,7 +177,6 @@ impl RpcDescription {
 			quote! {
 				let mut seq = params.sequence();
 				#(#decode_fields);*
-				(#params_fields)
 			}
 		};
 
@@ -220,11 +220,12 @@ impl RpcDescription {
 
 		// Parsing of `serde_json::Value`.
 		let parsing = quote! {
-			let (#params_fields) = if params.is_object() {
+			/*let (#params_fields) = if params.is_object() {
 				#decode_map
 			} else {
 				#decode_array
-			};
+			};*/
+			#decode_array;
 		};
 
 		(parsing, params_fields)