rpc server with HTTP/WS on the same socket (#12663)

* jsonrpsee v0.16

add backwards compatibility

run old http server on http only

* cargo fmt

* update jsonrpsee 0.16.1

* less verbose cors log

* fix nit in log: WS -> HTTP

* revert needless changes in Cargo.lock

* remove unused features in tower

* fix nits; add client-core feature

* jsonrpsee v0.16.2

substrate/client/rpc/src/state/mod.rs

@@ -28,9 +28,8 @@ use std::sync::Arc;
 use crate::SubscriptionTaskExecutor;
 
 use jsonrpsee::{
-	core::{Error as JsonRpseeError, RpcResult},
+	core::{server::rpc_module::SubscriptionSink, Error as JsonRpseeError, RpcResult},
 	types::SubscriptionResult,
-	ws_server::SubscriptionSink,
 };
 
 use sc_rpc_api::{state::ReadProof, DenyUnsafe};

substrate/client/rpc/src/state/tests.rs

@@ -23,7 +23,7 @@ use assert_matches::assert_matches;
 use futures::executor;
 use jsonrpsee::{
 	core::Error as RpcError,
-	types::{error::CallError as RpcCallError, EmptyParams, ErrorObject},
+	types::{error::CallError as RpcCallError, EmptyServerParams as EmptyParams, ErrorObject},
 };
 use sc_block_builder::BlockBuilderProvider;
 use sc_rpc_api::DenyUnsafe;