mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-19 21:31:37 +00:00
Similar to https://github.com/ethereum/go-ethereum/pull/31856, remove the not availabe shh, swarm modules in the console. --------- Co-authored-by: Zhou <DanialZhouMAX@gmail.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com>
This commit is contained in:
Daniel Liu
GitHub
parent
5081beee0e
commit
eb770486f2
3 changed files with 44 additions and 382 deletions
|
|
@ -1192,7 +1192,7 @@ module.exports = SolidityTypeInt;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file param.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
|
|
@ -1211,7 +1211,7 @@ var SolidityParam = function (value, offset) {
|
|||
|
||||
/**
|
||||
* This method should be used to get length of params's dynamic part
|
||||
*
|
||||
*
|
||||
* @method dynamicPartLength
|
||||
* @returns {Number} length of dynamic part (in bytes)
|
||||
*/
|
||||
|
|
@ -1239,7 +1239,7 @@ SolidityParam.prototype.withOffset = function (offset) {
|
|||
* @param {SolidityParam} result of combination
|
||||
*/
|
||||
SolidityParam.prototype.combine = function (param) {
|
||||
return new SolidityParam(this.value + param.value);
|
||||
return new SolidityParam(this.value + param.value);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1271,8 +1271,8 @@ SolidityParam.prototype.offsetAsBytes = function () {
|
|||
*/
|
||||
SolidityParam.prototype.staticPart = function () {
|
||||
if (!this.isDynamic()) {
|
||||
return this.value;
|
||||
}
|
||||
return this.value;
|
||||
}
|
||||
return this.offsetAsBytes();
|
||||
};
|
||||
|
||||
|
|
@ -1304,7 +1304,7 @@ SolidityParam.prototype.encode = function () {
|
|||
* @returns {String}
|
||||
*/
|
||||
SolidityParam.encodeList = function (params) {
|
||||
|
||||
|
||||
// updating offsets
|
||||
var totalOffset = params.length * 32;
|
||||
var offsetParams = params.map(function (param) {
|
||||
|
|
@ -1746,13 +1746,13 @@ if (typeof XMLHttpRequest === 'undefined') {
|
|||
|
||||
/**
|
||||
* Utils
|
||||
*
|
||||
*
|
||||
* @module utils
|
||||
*/
|
||||
|
||||
/**
|
||||
* Utility functions
|
||||
*
|
||||
*
|
||||
* @class [utils] config
|
||||
* @constructor
|
||||
*/
|
||||
|
|
@ -1819,7 +1819,7 @@ module.exports = {
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file sha3.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
|
|
@ -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.
|
||||
|
||||
|
|
@ -2739,7 +2730,7 @@ module.exports = AllSolidityEvents;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file batch.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
|
|
@ -2784,7 +2775,7 @@ Batch.prototype.execute = function () {
|
|||
requests[index].callback(null, (requests[index].format ? requests[index].format(result.result) : result.result));
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = Batch;
|
||||
|
|
@ -2971,7 +2962,7 @@ var ContractFactory = function (eth, abi) {
|
|||
*/
|
||||
this.new = function () {
|
||||
/*jshint maxcomplexity: 7 */
|
||||
|
||||
|
||||
var contract = new Contract(this.eth, this.abi);
|
||||
|
||||
// parse arguments
|
||||
|
|
@ -3119,7 +3110,7 @@ module.exports = ContractFactory;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file errors.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
|
|
@ -3394,7 +3385,7 @@ var extend = function (web3) {
|
|||
}
|
||||
};
|
||||
|
||||
ex.formatters = formatters;
|
||||
ex.formatters = formatters;
|
||||
ex.utils = utils;
|
||||
ex.Method = Method;
|
||||
ex.Property = Property;
|
||||
|
|
@ -3486,8 +3477,6 @@ var getOptions = function (options, type) {
|
|||
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
|
||||
toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
|
||||
};
|
||||
case 'shh':
|
||||
return options;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -4464,7 +4453,7 @@ module.exports = HttpProvider;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file iban.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
|
|
@ -4664,7 +4653,7 @@ Iban.prototype.address = function () {
|
|||
var base36 = this._iban.substr(4);
|
||||
var asBn = new BigNumber(base36, 36);
|
||||
return padLeft(asBn.toString(16), 20);
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
};
|
||||
|
|
@ -4709,7 +4698,7 @@ var IpcProvider = function (path, net) {
|
|||
var _this = this;
|
||||
this.responseCallbacks = {};
|
||||
this.path = path;
|
||||
|
||||
|
||||
this.connection = net.connect({path: this.path});
|
||||
|
||||
this.connection.on('error', function(e){
|
||||
|
|
@ -4719,7 +4708,7 @@ var IpcProvider = function (path, net) {
|
|||
|
||||
this.connection.on('end', function(){
|
||||
_this._timeout();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
// LISTEN FOR CONNECTION RESPONSES
|
||||
|
|
@ -4758,7 +4747,7 @@ Will parse the response and make an array out of it.
|
|||
IpcProvider.prototype._parseResponse = function(data) {
|
||||
var _this = this,
|
||||
returnValues = [];
|
||||
|
||||
|
||||
// DE-CHUNKER
|
||||
var dechunkedData = data
|
||||
.replace(/\}[\n\r]?\{/g,'}|--|{') // }{
|
||||
|
|
@ -4862,7 +4851,7 @@ IpcProvider.prototype.send = function (payload) {
|
|||
try {
|
||||
result = JSON.parse(data);
|
||||
} catch(e) {
|
||||
throw errors.InvalidResponse(data);
|
||||
throw errors.InvalidResponse(data);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
@ -5037,7 +5026,7 @@ Method.prototype.extractCallback = function (args) {
|
|||
|
||||
/**
|
||||
* Should be called to check if the number of arguments is correct
|
||||
*
|
||||
*
|
||||
* @method validateArgs
|
||||
* @param {Array} arguments
|
||||
* @throws {Error} if it is not
|
||||
|
|
@ -5050,7 +5039,7 @@ Method.prototype.validateArgs = function (args) {
|
|||
|
||||
/**
|
||||
* Should be called to format input args of method
|
||||
*
|
||||
*
|
||||
* @method formatInput
|
||||
* @param {Array}
|
||||
* @return {Array}
|
||||
|
|
@ -5104,7 +5093,7 @@ Method.prototype.attachToObject = function (obj) {
|
|||
obj[name[0]] = obj[name[0]] || {};
|
||||
obj[name[0]][name[1]] = func;
|
||||
} else {
|
||||
obj[name[0]] = func;
|
||||
obj[name[0]] = func;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -5167,8 +5156,8 @@ var DB = function (web3) {
|
|||
this._requestManager = web3._requestManager;
|
||||
|
||||
var self = this;
|
||||
|
||||
methods().forEach(function(method) {
|
||||
|
||||
methods().forEach(function(method) {
|
||||
method.attachToObject(self);
|
||||
method.setRequestManager(web3._requestManager);
|
||||
});
|
||||
|
|
@ -5441,7 +5430,7 @@ var methods = function () {
|
|||
inputFormatter: [null, formatters.inputDefaultBlockNumberFormatter],
|
||||
outputFormatter: utils.toDecimal
|
||||
});
|
||||
|
||||
|
||||
var sendRawTransaction = new Method({
|
||||
name: 'sendRawTransaction',
|
||||
call: 'eth_sendRawTransaction',
|
||||
|
|
@ -5661,7 +5650,7 @@ var Net = function (web3) {
|
|||
|
||||
var self = this;
|
||||
|
||||
properties().forEach(function(p) {
|
||||
properties().forEach(function(p) {
|
||||
p.attachToObject(self);
|
||||
p.setRequestManager(web3._requestManager);
|
||||
});
|
||||
|
|
@ -5801,300 +5790,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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/** @file shh.js
|
||||
* @authors:
|
||||
* Fabian Vogelsteller <fabian@ethereum.org>
|
||||
* Marek Kotewicz <marek@ethcore.io>
|
||||
* @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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
* @file bzz.js
|
||||
* @author Alex Beregszaszi <alex@rtfs.hu>
|
||||
* @date 2016
|
||||
*
|
||||
* Reference: https://github.com/XinFinOrg/XDPoSChain/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.
|
||||
|
||||
|
|
@ -6170,36 +5866,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
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -6220,7 +5888,7 @@ module.exports = {
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file namereg.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
|
|
@ -6407,7 +6075,7 @@ module.exports = Property;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file requestmanager.js
|
||||
* @author Jeffrey Wilcke <jeff@ethdev.com>
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
|
|
@ -6474,7 +6142,7 @@ RequestManager.prototype.sendAsync = function (data, callback) {
|
|||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
|
||||
if (!Jsonrpc.isValidResponse(result)) {
|
||||
return callback(errors.InvalidResponse(result));
|
||||
}
|
||||
|
|
@ -6507,7 +6175,7 @@ RequestManager.prototype.sendBatch = function (data, callback) {
|
|||
}
|
||||
|
||||
callback(err, results);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -6611,7 +6279,7 @@ RequestManager.prototype.poll = function () {
|
|||
}
|
||||
|
||||
var payload = Jsonrpc.toBatchPayload(pollsData);
|
||||
|
||||
|
||||
// map the request id to they poll id
|
||||
var pollsIdMap = {};
|
||||
payload.forEach(function(load, index){
|
||||
|
|
@ -6641,7 +6309,7 @@ RequestManager.prototype.poll = function () {
|
|||
} else
|
||||
return false;
|
||||
}).filter(function (result) {
|
||||
return !!result;
|
||||
return !!result;
|
||||
}).filter(function (result) {
|
||||
var valid = Jsonrpc.isValidResponse(result);
|
||||
if (!valid) {
|
||||
|
|
@ -6716,16 +6384,16 @@ var pollSyncing = function(self) {
|
|||
|
||||
self.callbacks.forEach(function (callback) {
|
||||
if (self.lastSyncState !== sync) {
|
||||
|
||||
|
||||
// call the callback with true first so the app can stop anything, before receiving the sync data
|
||||
if(!self.lastSyncState && utils.isObject(sync))
|
||||
callback(null, true);
|
||||
|
||||
|
||||
// call on the next CPU cycle, so the actions of the sync stop can be processes first
|
||||
setTimeout(function() {
|
||||
callback(null, sync);
|
||||
}, 0);
|
||||
|
||||
|
||||
self.lastSyncState = sync;
|
||||
}
|
||||
});
|
||||
|
|
@ -6780,7 +6448,7 @@ module.exports = IsSyncing;
|
|||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @file transfer.js
|
||||
* @author Marek Kotewicz <marek@ethdev.com>
|
||||
* @date 2015
|
||||
|
|
@ -6799,7 +6467,7 @@ var exchangeAbi = require('../contracts/SmartExchange.json');
|
|||
* @param {Function} callback, callback
|
||||
*/
|
||||
var transfer = function (eth, from, to, value, callback) {
|
||||
var iban = new Iban(to);
|
||||
var iban = new Iban(to);
|
||||
if (!iban.isValid()) {
|
||||
throw new Error('invalid iban address');
|
||||
}
|
||||
|
|
@ -6807,7 +6475,7 @@ var transfer = function (eth, from, to, value, callback) {
|
|||
if (iban.isDirect()) {
|
||||
return transferToAddress(eth, from, iban.address(), value, callback);
|
||||
}
|
||||
|
||||
|
||||
if (!callback) {
|
||||
var address = eth.icapNamereg().addr(iban.institution());
|
||||
return deposit(eth, from, address, value, iban.client());
|
||||
|
|
@ -6816,7 +6484,7 @@ var transfer = function (eth, from, to, value, callback) {
|
|||
eth.icapNamereg().addr(iban.institution(), function (err, address) {
|
||||
return deposit(eth, from, address, value, iban.client(), callback);
|
||||
});
|
||||
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -533,12 +533,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 "<namespace>_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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue