diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js
index 0071d7eb7d..3a19dce06c 100644
--- a/internal/jsre/deps/web3.js
+++ b/internal/jsre/deps/web3.js
@@ -2510,10 +2510,8 @@ var RequestManager = require('./web3/requestmanager');
var Iban = require('./web3/iban');
var Eth = require('./web3/methods/eth');
var DB = require('./web3/methods/db');
-var Shh = require('./web3/methods/shh');
var Net = require('./web3/methods/net');
var Personal = require('./web3/methods/personal');
-var Swarm = require('./web3/methods/swarm');
var Settings = require('./web3/settings');
var version = require('./version.json');
var utils = require('./utils/utils');
@@ -2532,10 +2530,8 @@ function Web3 (provider) {
this.currentProvider = provider;
this.eth = new Eth(this);
this.db = new DB(this);
- this.shh = new Shh(this);
this.net = new Net(this);
this.personal = new Personal(this);
- this.bzz = new Swarm(this);
this.settings = new Settings();
this.version = {
api: version.version
@@ -2612,11 +2608,6 @@ var properties = function () {
name: 'version.ethereum',
getter: 'eth_protocolVersion',
inputFormatter: utils.toDecimal
- }),
- new Property({
- name: 'version.whisper',
- getter: 'shh_version',
- inputFormatter: utils.toDecimal
})
];
};
@@ -2632,7 +2623,7 @@ Web3.prototype.createBatch = function () {
module.exports = Web3;
-},{"./utils/sha3":19,"./utils/utils":20,"./version.json":21,"./web3/batch":24,"./web3/extend":28,"./web3/httpprovider":32,"./web3/iban":33,"./web3/ipcprovider":34,"./web3/methods/db":37,"./web3/methods/eth":38,"./web3/methods/net":39,"./web3/methods/personal":40,"./web3/methods/shh":41,"./web3/methods/swarm":42,"./web3/property":45,"./web3/requestmanager":46,"./web3/settings":47,"bignumber.js":"bignumber.js"}],23:[function(require,module,exports){
+},{"./utils/sha3":19,"./utils/utils":20,"./version.json":21,"./web3/batch":24,"./web3/extend":28,"./web3/httpprovider":32,"./web3/iban":33,"./web3/ipcprovider":34,"./web3/methods/db":37,"./web3/methods/eth":38,"./web3/methods/net":39,"./web3/methods/personal":40,"./web3/property":45,"./web3/requestmanager":46,"./web3/settings":47,"bignumber.js":"bignumber.js"}],23:[function(require,module,exports){
/*
This file is part of web3.js.
@@ -3486,8 +3477,6 @@ var getOptions = function (options, type) {
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
};
- case 'shh':
- return options;
}
};
@@ -5699,300 +5688,7 @@ var properties = function () {
module.exports = Personal;
-},{"../formatters":30,"../method":36,"../property":45}],41:[function(require,module,exports){
-/*
- This file is part of web3.js.
-
- web3.js is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- web3.js is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with web3.js. If not, see .
-*/
-/** @file shh.js
- * @authors:
- * Fabian Vogelsteller
- * Marek Kotewicz
- * @date 2017
- */
-
-var Method = require('../method');
-var Filter = require('../filter');
-var watches = require('./watches');
-
-var Shh = function (web3) {
- this._requestManager = web3._requestManager;
-
- var self = this;
-
- methods().forEach(function(method) {
- method.attachToObject(self);
- method.setRequestManager(self._requestManager);
- });
-};
-
-Shh.prototype.newMessageFilter = function (options, callback, filterCreationErrorCallback) {
- return new Filter(options, 'shh', this._requestManager, watches.shh(), null, callback, filterCreationErrorCallback);
-};
-
-var methods = function () {
-
- return [
- new Method({
- name: 'version',
- call: 'shh_version',
- params: 0
- }),
- new Method({
- name: 'info',
- call: 'shh_info',
- params: 0
- }),
- new Method({
- name: 'setMaxMessageSize',
- call: 'shh_setMaxMessageSize',
- params: 1
- }),
- new Method({
- name: 'setMinPoW',
- call: 'shh_setMinPoW',
- params: 1
- }),
- new Method({
- name: 'markTrustedPeer',
- call: 'shh_markTrustedPeer',
- params: 1
- }),
- new Method({
- name: 'newKeyPair',
- call: 'shh_newKeyPair',
- params: 0
- }),
- new Method({
- name: 'addPrivateKey',
- call: 'shh_addPrivateKey',
- params: 1
- }),
- new Method({
- name: 'deleteKeyPair',
- call: 'shh_deleteKeyPair',
- params: 1
- }),
- new Method({
- name: 'hasKeyPair',
- call: 'shh_hasKeyPair',
- params: 1
- }),
- new Method({
- name: 'getPublicKey',
- call: 'shh_getPublicKey',
- params: 1
- }),
- new Method({
- name: 'getPrivateKey',
- call: 'shh_getPrivateKey',
- params: 1
- }),
- new Method({
- name: 'newSymKey',
- call: 'shh_newSymKey',
- params: 0
- }),
- new Method({
- name: 'addSymKey',
- call: 'shh_addSymKey',
- params: 1
- }),
- new Method({
- name: 'generateSymKeyFromPassword',
- call: 'shh_generateSymKeyFromPassword',
- params: 1
- }),
- new Method({
- name: 'hasSymKey',
- call: 'shh_hasSymKey',
- params: 1
- }),
- new Method({
- name: 'getSymKey',
- call: 'shh_getSymKey',
- params: 1
- }),
- new Method({
- name: 'deleteSymKey',
- call: 'shh_deleteSymKey',
- params: 1
- }),
-
- // subscribe and unsubscribe missing
-
- new Method({
- name: 'post',
- call: 'shh_post',
- params: 1,
- inputFormatter: [null]
- })
- ];
-};
-
-module.exports = Shh;
-
-
-},{"../filter":29,"../method":36,"./watches":43}],42:[function(require,module,exports){
-/*
- This file is part of web3.js.
-
- web3.js is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- web3.js is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with web3.js. If not, see .
-*/
-/**
- * @file bzz.js
- * @author Alex Beregszaszi
- * @date 2016
- *
- * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33
- */
-
-"use strict";
-
-var Method = require('../method');
-var Property = require('../property');
-
-function Swarm(web3) {
- this._requestManager = web3._requestManager;
-
- var self = this;
-
- methods().forEach(function(method) {
- method.attachToObject(self);
- method.setRequestManager(self._requestManager);
- });
-
- properties().forEach(function(p) {
- p.attachToObject(self);
- p.setRequestManager(self._requestManager);
- });
-}
-
-var methods = function () {
- var blockNetworkRead = new Method({
- name: 'blockNetworkRead',
- call: 'bzz_blockNetworkRead',
- params: 1,
- inputFormatter: [null]
- });
-
- var syncEnabled = new Method({
- name: 'syncEnabled',
- call: 'bzz_syncEnabled',
- params: 1,
- inputFormatter: [null]
- });
-
- var swapEnabled = new Method({
- name: 'swapEnabled',
- call: 'bzz_swapEnabled',
- params: 1,
- inputFormatter: [null]
- });
-
- var download = new Method({
- name: 'download',
- call: 'bzz_download',
- params: 2,
- inputFormatter: [null, null]
- });
-
- var upload = new Method({
- name: 'upload',
- call: 'bzz_upload',
- params: 2,
- inputFormatter: [null, null]
- });
-
- var retrieve = new Method({
- name: 'retrieve',
- call: 'bzz_retrieve',
- params: 1,
- inputFormatter: [null]
- });
-
- var store = new Method({
- name: 'store',
- call: 'bzz_store',
- params: 2,
- inputFormatter: [null, null]
- });
-
- var get = new Method({
- name: 'get',
- call: 'bzz_get',
- params: 1,
- inputFormatter: [null]
- });
-
- var put = new Method({
- name: 'put',
- call: 'bzz_put',
- params: 2,
- inputFormatter: [null, null]
- });
-
- var modify = new Method({
- name: 'modify',
- call: 'bzz_modify',
- params: 4,
- inputFormatter: [null, null, null, null]
- });
-
- return [
- blockNetworkRead,
- syncEnabled,
- swapEnabled,
- download,
- upload,
- retrieve,
- store,
- get,
- put,
- modify
- ];
-};
-
-var properties = function () {
- return [
- new Property({
- name: 'hive',
- getter: 'bzz_hive'
- }),
- new Property({
- name: 'info',
- getter: 'bzz_info'
- })
- ];
-};
-
-
-module.exports = Swarm;
-
-},{"../method":36,"../property":45}],43:[function(require,module,exports){
+},{"../formatters":30,"../method":36,"../property":45}],43:[function(require,module,exports){
/*
This file is part of web3.js.
@@ -6068,36 +5764,8 @@ var eth = function () {
];
};
-/// @returns an array of objects describing web3.shh.watch api methods
-var shh = function () {
-
- return [
- new Method({
- name: 'newFilter',
- call: 'shh_newMessageFilter',
- params: 1
- }),
- new Method({
- name: 'uninstallFilter',
- call: 'shh_deleteMessageFilter',
- params: 1
- }),
- new Method({
- name: 'getLogs',
- call: 'shh_getFilterMessages',
- params: 1
- }),
- new Method({
- name: 'poll',
- call: 'shh_getFilterMessages',
- params: 1
- })
- ];
-};
-
module.exports = {
- eth: eth,
- shh: shh
+ eth: eth
};
diff --git a/rpc/client.go b/rpc/client.go
index f9a8f1116b..ba7e43eb5c 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -487,12 +487,6 @@ func (c *Client) EthSubscribe(ctx context.Context, channel interface{}, args ...
return c.Subscribe(ctx, "eth", channel, args...)
}
-// ShhSubscribe registers a subscription under the "shh" namespace.
-// 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...)
-}
-
// 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
diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go
index e52f390adb..cd44d219de 100644
--- a/rpc/subscription_test.go
+++ b/rpc/subscription_test.go
@@ -59,7 +59,7 @@ func TestSubscriptions(t *testing.T) {
t.Parallel()
var (
- namespaces = []string{"eth", "bzz"}
+ namespaces = []string{"eth"}
service = ¬ificationTestService{}
subCount = len(namespaces)
notificationCount = 3