From c872bdf41f44597b5b582cdc2fea45449f317e50 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Tue, 26 Jan 2021 10:24:36 +0100 Subject: [PATCH 1/3] rpc: Remove whisper subscription --- rpc/client.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rpc/client.go b/rpc/client.go index 9393adb7790..d633eb7db81 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -413,11 +413,6 @@ func (c *Client) EthSubscribe(ctx context.Context, channel interface{}, args ... return c.Subscribe(ctx, "eth", channel, args...) } -// ShhSubscribe registers a subscripion under the "shh" namespace. -func (c *Client) ShhSubscribe(ctx context.Context, channel interface{}, args ...interface{}) (*ClientSubscription, error) { - return c.Subscribe(ctx, "shh", channel, args...) -} - // Subscribe calls the "_subscribe" method with the given arguments, // registering a subscription. Server notifications for the subscription are // sent to the given channel. The element type of the channel must match the From 2e49c37081d15b75f96ead47eb1601d80920d5ff Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Wed, 27 Jan 2021 08:58:04 +0000 Subject: [PATCH 2/3] deprecate ShhSubscribe instead --- rpc/client.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpc/client.go b/rpc/client.go index d633eb7db81..ecc65ac4b3c 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -413,6 +413,12 @@ func (c *Client) EthSubscribe(ctx context.Context, channel interface{}, args ... return c.Subscribe(ctx, "eth", channel, args...) } +// ShhSubscribe registers a subscripion under the "shh" namespace. +// Deprecated: whisper is deprecated and doesn't use subscriptions +func (c *Client) ShhSubscribe(ctx context.Context, channel interface{}, args ...interface{}) (*ClientSubscription, error) { + return c.Subscribe(ctx, "shh", channel, args...) +} + // Subscribe calls the "_subscribe" method with the given arguments, // registering a subscription. Server notifications for the subscription are // sent to the given channel. The element type of the channel must match the From ec2ec941d7358053d49d9507334f6fd750d23322 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 27 Jan 2021 10:19:52 +0100 Subject: [PATCH 3/3] Update client.go --- rpc/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpc/client.go b/rpc/client.go index ecc65ac4b3c..198ce635735 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -414,7 +414,7 @@ func (c *Client) EthSubscribe(ctx context.Context, channel interface{}, args ... } // ShhSubscribe registers a subscripion under the "shh" namespace. -// Deprecated: whisper is deprecated and doesn't use subscriptions +// Deprecated: use Subscribe(ctx, "shh", ...). func (c *Client) ShhSubscribe(ctx context.Context, channel interface{}, args ...interface{}) (*ClientSubscription, error) { return c.Subscribe(ctx, "shh", channel, args...) }