poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9d84609b3faf797f4a611587abdda3d6b3b07917' into develop

This commit is contained in:
obscuren 2015-02-05 12:07:36 -08:00
parent c64852dbcc 9d84609b3f
commit 7e0799ff21
4 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/mist/assets/ext/ethereum.js/dist/ethereum.js vendored
View File

@ -1043,33 +1043,16 @@ var ProviderManager = function() {
var self = this; var self = this;
var poll = function () { var poll = function () {
if (self.provider) { self.polls.forEach(function (data) {
var pollsBatch = self.polls.map(function (data) { var result = self.send(data.data);
return data.data;
});
var payload = jsonrpc.toBatchPayload(pollsBatch); if (!(result instanceof Array) || result.length === 0) {
var results = self.provider.send(payload); return;
}
self.polls.forEach(function (data, index) { data.callback(result);
var result = results[index]; });
if (!jsonrpc.isValidResponse(result)) {
console.log(result);
return;
}
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); setTimeout(poll, 1000);
}; };
poll(); poll();

4
cmd/mist/assets/ext/ethereum.js/dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
cmd/mist/assets/ext/ethereum.js/dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

31
cmd/mist/assets/ext/ethereum.js/lib/providermanager.js
View File

@ -42,33 +42,16 @@ var ProviderManager = function() {
var self = this; var self = this;
var poll = function () { var poll = function () {
if (self.provider) { self.polls.forEach(function (data) {
var pollsBatch = self.polls.map(function (data) { var result = self.send(data.data);
return data.data;
});
var payload = jsonrpc.toBatchPayload(pollsBatch); if (!(result instanceof Array) || result.length === 0) {
var results = self.provider.send(payload); return;
}
self.polls.forEach(function (data, index) { data.callback(result);
var result = results[index]; });
if (!jsonrpc.isValidResponse(result)) {
console.log(result);
return;
}
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); setTimeout(poll, 1000);
}; };
poll(); poll();