diff options
author | obscuren <geffobscura@gmail.com> | 2015-02-06 04:07:36 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-02-06 04:07:36 +0800 |
commit | 7e0799ff212b986feb7536e879224280950bae52 (patch) | |
tree | 069fbe5dc489491b554b15781b9ea8c62dfdae40 /cmd/mist/assets/ext/ethereum.js/lib | |
parent | c64852dbccd0c8eb57cab994aefd0243c65b351b (diff) | |
parent | 9d84609b3faf797f4a611587abdda3d6b3b07917 (diff) | |
download | go-tangerine-7e0799ff212b986feb7536e879224280950bae52.tar go-tangerine-7e0799ff212b986feb7536e879224280950bae52.tar.gz go-tangerine-7e0799ff212b986feb7536e879224280950bae52.tar.bz2 go-tangerine-7e0799ff212b986feb7536e879224280950bae52.tar.lz go-tangerine-7e0799ff212b986feb7536e879224280950bae52.tar.xz go-tangerine-7e0799ff212b986feb7536e879224280950bae52.tar.zst go-tangerine-7e0799ff212b986feb7536e879224280950bae52.zip |
Merge commit '9d84609b3faf797f4a611587abdda3d6b3b07917' into develop
Diffstat (limited to 'cmd/mist/assets/ext/ethereum.js/lib')
-rw-r--r-- | cmd/mist/assets/ext/ethereum.js/lib/providermanager.js | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/providermanager.js b/cmd/mist/assets/ext/ethereum.js/lib/providermanager.js index 55f166bcd..55b072634 100644 --- a/cmd/mist/assets/ext/ethereum.js/lib/providermanager.js +++ b/cmd/mist/assets/ext/ethereum.js/lib/providermanager.js @@ -42,33 +42,16 @@ var ProviderManager = function() { var self = this; var poll = function () { - if (self.provider) { - var pollsBatch = self.polls.map(function (data) { - return data.data; - }); + self.polls.forEach(function (data) { + var result = self.send(data.data); - var payload = jsonrpc.toBatchPayload(pollsBatch); - var results = self.provider.send(payload); + if (!(result instanceof Array) || result.length === 0) { + return; + } - self.polls.forEach(function (data, index) { - var result = results[index]; - - if (!jsonrpc.isValidResponse(result)) { - console.log(result); - return; - } + data.callback(result); + }); - result = result.result; - // dont call the callback if result is not an array, or empty one - if (!(result instanceof Array) || result.length === 0) { - return; - } - - data.callback(result); - - }); - - } setTimeout(poll, 1000); }; poll(); |