companion #8738 (jsonrpsee) (#823)

* update polkadot and substrate

* add jsonrpsee glue code

* fix tests

* update substrate & polkadot

* update substrate & polkadot

* update Cargo.lock

* revert Cargo.toml

* revert changes in Cargo.toml

* update companion

* revert substrate change

* add Cargo.lock

* update substrate manually

* update polkadot

cumulus/test/service/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 async-trait = "0.1.53"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 criterion = { version = "0.3.5", features = [ "async_tokio" ] }
-jsonrpc-core = "18.0.0"
+jsonrpsee = { version = "0.12.0", features = ["server"] }
 parking_lot = "0.12.0"
 rand = "0.8.5"
 serde = { version = "1.0.137", features = ["derive"] }

cumulus/test/service/src/lib.rs

@@ -225,9 +225,7 @@ async fn start_node_impl<RB>(
 	TransactionPool,
 )>
 where
-	RB: Fn(Arc<Client>) -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, sc_service::Error>
-		+ Send
-		+ 'static,
+	RB: Fn(Arc<Client>) -> Result<jsonrpsee::RpcModule<()>, sc_service::Error> + Send + 'static,
 {
 	if matches!(parachain_config.role, Role::Light) {
 		return Err("Light client not supported!".into())
@@ -272,14 +270,14 @@ where
 			warp_sync: None,
 		})?;
 
-	let rpc_extensions_builder = {
+	let rpc_builder = {
 		let client = client.clone();
 
 		Box::new(move |_, _| rpc_ext_builder(client.clone()))
 	};
 
 	let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
-		rpc_extensions_builder,
+		rpc_builder,
 		client: client.clone(),
 		transaction_pool: transaction_pool.clone(),
 		task_manager: &mut task_manager,
@@ -581,7 +579,7 @@ impl TestNodeBuilder {
 			relay_chain_config,
 			self.para_id,
 			self.wrap_announce_block,
-			|_| Ok(Default::default()),
+			|_| Ok(jsonrpsee::RpcModule::new(())),
 			self.consensus,
 			collator_options,
 		)
@@ -675,6 +673,10 @@ pub fn node_config(
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_max_payload: None,
+		rpc_max_request_size: None,
+		rpc_max_response_size: None,
+		rpc_id_provider: None,
+		rpc_max_subs_per_conn: None,
 		ws_max_out_buffer_capacity: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,

cumulus/test/service/tests/full_node_catching_up.rs

@@ -18,7 +18,7 @@ use cumulus_primitives_core::ParaId;
 use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*};
 use futures::join;
 
-#[substrate_test_utils::test]
+#[substrate_test_utils::test(flavor = "multi_thread")]
 #[ignore]
 async fn test_full_node_catching_up() {
 	let mut builder = sc_cli::LoggerBuilder::new("");

cumulus/test/service/tests/migrate_solo_to_para.rs

@@ -30,7 +30,7 @@ use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Ke
 use sc_client_api::{BlockBackend, UsageProvider};
 use sp_runtime::generic::BlockId;
 
-#[substrate_test_utils::test]
+#[substrate_test_utils::test(flavor = "multi_thread")]
 #[ignore]
 async fn test_migrate_solo_to_para() {
 	let mut builder = sc_cli::LoggerBuilder::new("");

cumulus/test/service/tests/runtime_upgrade.rs

@@ -20,7 +20,7 @@ use futures::StreamExt;
 use sc_client_api::BlockchainEvents;
 use sp_runtime::generic::BlockId;
 
-#[substrate_test_utils::test]
+#[substrate_test_utils::test(flavor = "multi_thread")]
 #[ignore]
 async fn test_runtime_upgrade() {
 	let mut builder = sc_cli::LoggerBuilder::new("runtime=debug");