Unverified Commit 6af6db24 authored by David's avatar David Committed by GitHub
Browse files

Implement SubscriptionClient for HttpClient (#563)

Closes https://github.com/paritytech/jsonrpsee/issues/448

This PR adds an implementation for `SubscriptionClient` to the `HttpClient` struct, which makes it possible for http clients to use macro-generated RPC servers. If an http client tries to set up a subscription it will fail with a `HttpNotImplemented` error.
parent e2d4722c
......@@ -26,9 +26,9 @@
use crate::transport::HttpTransportClient;
use crate::types::{
traits::{Client, SubscriptionClient},
v2::{Id, NotificationSer, ParamsSer, RequestSer, Response, RpcError},
CertificateStore, Error, RequestIdManager, TEN_MB_SIZE_BYTES,
CertificateStore, Error, RequestIdManager, Subscription, TEN_MB_SIZE_BYTES,
use async_trait::async_trait;
use fnv::FnvHashMap;
......@@ -194,3 +194,27 @@ impl Client for HttpClient {
impl SubscriptionClient for HttpClient {
/// Send a subscription request to the server. Not implemented for HTTP; will always return [`Error::HttpNotImplemented`].
async fn subscribe<'a, N>(
_subscribe_method: &'a str,
_params: Option<ParamsSer<'a>>,
_unsubscribe_method: &'a str,
) -> Result<Subscription<N>, Error>
N: DeserializeOwned,
/// Subscribe to a specific method. Not implemented for HTTP; will always return [`Error::HttpNotImplemented`].
async fn subscribe_to_method<'a, N>(&self, _method: &'a str) -> Result<Subscription<N>, Error>
N: DeserializeOwned,
......@@ -28,7 +28,11 @@
use std::net::SocketAddr;
use jsonrpsee::{ws_client::*, ws_server::WsServerBuilder};
use jsonrpsee::{
http_client::HttpClientBuilder, http_server::HttpServerBuilder, types::Error, ws_client::*,
use serde_json::value::RawValue;
mod rpc_impl {
......@@ -305,3 +309,18 @@ async fn multiple_blocking_calls_overlap() {
// Each request takes 50ms, added 10ms margin for scheduling
assert!(elapsed < Duration::from_millis(60), "Expected less than 60ms, got {:?}", elapsed);
async fn subscriptions_do_not_work_for_http_servers() {
let htserver = HttpServerBuilder::default().build("".parse().unwrap()).unwrap();
let addr = htserver.local_addr().unwrap();
let htserver_url = format!("http://{}", addr);
let _handle = htserver.start(RpcServerImpl.into_rpc()).unwrap();
let htclient = HttpClientBuilder::default().build(&htserver_url).unwrap();
assert_eq!(htclient.sync_method().await.unwrap(), 10);
assert!(matches!(htclient.sub().await, Err(Error::HttpNotImplemented)));
assert_eq!(htclient.sync_method().await.unwrap(), 10);
......@@ -160,6 +160,9 @@ pub enum Error {
/// Custom error.
#[error("Custom error: {0}")]
/// Not implemented for HTTP clients.
#[error("Not implemented")]
impl Error {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment