From 1be3e5ec5e12b76c7ddff004b5dbe9baf8267591 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Thu, 27 Jul 2017 12:38:22 +0200 Subject: [PATCH 1/2] fix subscription name --- whisper/src/rpc/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/whisper/src/rpc/mod.rs b/whisper/src/rpc/mod.rs index 31fe997d5..6cec20c69 100644 --- a/whisper/src/rpc/mod.rs +++ b/whisper/src/rpc/mod.rs @@ -132,9 +132,9 @@ build_rpc_trait! { pub trait WhisperPubSub { type Metadata; - #[pubsub(name = "hello")] { + #[pubsub(name = "shh_subscription")] { /// Subscribe to messages matching the filter. - #[rpc(name = "ssh_subscribe")] + #[rpc(name = "shh_subscribe")] fn subscribe(&self, Self::Metadata, pubsub::Subscriber, types::FilterRequest); /// Unsubscribe from filter matching given ID. Return From 18fbf3c174cc0a4f3e52c12296618aa45c070f22 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Thu, 27 Jul 2017 12:52:36 +0200 Subject: [PATCH 2/2] only add pubsub if generic pubsub off --- parity/rpc_apis.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs index 234a7d299..dba69ae7e 100644 --- a/parity/rpc_apis.rs +++ b/parity/rpc_apis.rs @@ -282,9 +282,11 @@ impl FullDependencies { } }, Api::EthPubSub => { - let client = EthPubSubClient::new(self.client.clone(), self.remote.clone()); - self.client.add_notify(client.handler()); - handler.extend_with(client.to_delegate()); + if !for_generic_pubsub { + let client = EthPubSubClient::new(self.client.clone(), self.remote.clone()); + self.client.add_notify(client.handler()); + handler.extend_with(client.to_delegate()); + } }, Api::Personal => { handler.extend_with(PersonalClient::new(&self.secret_store, dispatcher.clone(), self.geth_compatibility).to_delegate()); @@ -353,9 +355,13 @@ impl FullDependencies { } } Api::WhisperPubSub => { - if let Some(ref whisper_rpc) = self.whisper_rpc { - let whisper = whisper_rpc.make_handler(); - handler.extend_with(::parity_whisper::rpc::WhisperPubSub::to_delegate(whisper)); + if !for_generic_pubsub { + if let Some(ref whisper_rpc) = self.whisper_rpc { + let whisper = whisper_rpc.make_handler(); + handler.extend_with( + ::parity_whisper::rpc::WhisperPubSub::to_delegate(whisper) + ); + } } } }