embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix error logs in the cockpit due from negative blocks numbers (#1967)

This commit is contained in:
Jonathan Rainville 2019-10-13 21:53:14 -04:00 committed by Iuri Matias
parent d86c26d71a
commit 4b947bb5c2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/embark/src/lib/modules/ethereum-blockchain-client/api.js
View File

@ -153,11 +153,13 @@ export default class EthereumAPI {
}); });
}, },
function (next) { function (next) {
async.times(limit, function (n, eachCb) { if (from - limit < 0) {
self.web3.eth.getBlock(from - n, returnTransactionObjects, function (err, block) { limit = from + 1;
}
async.times(limit, (n, eachCb) => {
self.web3.eth.getBlock(from - n, returnTransactionObjects, (err, block) => {
if (err) { if (err) {
// FIXME Returns an error because we are too low return eachCb(err);
return eachCb();
} }
if (!block) { if (!block) {
return eachCb(); return eachCb();

1
packages/stack/proxy/src/proxy.js
View File

@ -57,6 +57,7 @@ export class Proxy {
// Send the possibly modified request to the Node // Send the possibly modified request to the Node
requestManager.send(resp.reqData, (err, result) => { requestManager.send(resp.reqData, (err, result) => {
if (err) { if (err) {
this.logger.debug(JSON.stringify(resp.reqData));
return this.logger.error(__('Error executing the request on the Node'), err.message || err); return this.logger.error(__('Error executing the request on the Node'), err.message || err);
} }
this.emitActionsForResponse(resp.reqData, {jsonrpc: "2.0", id: resp.reqData.id, result}, (_err, resp) => { this.emitActionsForResponse(resp.reqData, {jsonrpc: "2.0", id: resp.reqData.id, result}, (_err, resp) => {