fix linter

This commit is contained in:
Evan Chou 2021-01-27 15:44:43 +01:00 committed by cryptomancer
parent a7ddc28c68
commit 2d4fea05a4
9 changed files with 64 additions and 45 deletions

View File

@ -26,9 +26,22 @@ async function getBlock(blockNumber) {
})).data.result;
}
const blockData = (t) => ({ refHiveBlockNumber: t.refHiveBlockNumber, transactionId: t.transactionId, sender: t.sender, contract: t.contract, payload: t.payload, executedCodeHash: t.executedCodeHash, logs: t.logs });
const blockData = t => ({
refHiveBlockNumber: t.refHiveBlockNumber,
transactionId: t.transactionId,
sender: t.sender,
contract: t.contract,
payload: t.payload,
executedCodeHash: t.executedCodeHash,
logs: t.logs,
});
function compareBlocks(block1, block2) {
return JSON.stringify(block1.transactions.map(blockData).concat(block1.virtualTransactions.map(blockData))) === JSON.stringify(block2.transactions.map(blockData).concat(block2.virtualTransactions.map(blockData)));
return JSON.stringify(block1.transactions.map(blockData).concat(
block1.virtualTransactions.map(blockData),
))
=== JSON.stringify(block2.transactions.map(blockData).concat(
block2.virtualTransactions.map(blockData),
));
}
async function findDivergentBlock() {
@ -49,8 +62,9 @@ async function findDivergentBlock() {
const check = Math.floor((low + high) / 2);
mainBlock = await getBlock(check);
block = await chain.findOne({ _id: check });
//if (mainBlock.databaseHash !== block.databaseHash) {
//if (mainBlock.refHiveBlockNumber !== block.refHiveBlockNumber) {
// Different comparison modes, uncomment desired comparison.
// if (mainBlock.databaseHash !== block.databaseHash) {
// if (mainBlock.refHiveBlockNumber !== block.refHiveBlockNumber) {
if (!compareBlocks(mainBlock, block)) {
high = check - 1;
} else {

View File

@ -188,7 +188,8 @@ class Block {
// don't save logs
} else {
this.virtualTransactions.push(transaction);
if (mainBlock && currentDatabaseHash !== mainBlock.virtualTransactions[relIndex].databaseHash) {
if (mainBlock && currentDatabaseHash
!== mainBlock.virtualTransactions[relIndex].databaseHash) {
console.warn(mainBlock.virtualTransactions[relIndex]); // eslint-disable-line no-console
console.warn(transaction); // eslint-disable-line no-console
throw new Error('tx hash mismatch with api');
@ -206,8 +207,7 @@ class Block {
this.merkleRoot = merkleRoots.hash;
this.databaseHash = merkleRoots.databaseHash;
this.hash = this.calculateHash();
} else if (currentDatabaseHash != this.previousDatabaseHash) {
//throw new Error("Database hash changed without sidechain block at " + this.refHiveBlockNumber);
} else if (currentDatabaseHash !== this.previousDatabaseHash) {
await database.noteHashChange(this.refHiveBlockNumber);
}
}

View File

@ -204,7 +204,7 @@ class Database {
lastBlock.otherHashChangeRefHiveBlocks = [];
}
lastBlock.otherHashChangeRefHiveBlocks.push(refHiveBlockNumber);
await this.chain.updateOne({ _id: lastBlock._id }, { $set: { otherHashChangeRefHiveBlocks: lastBlock.otherHashChangeRefHiveBlocks }}, { session: this.session });
await this.chain.updateOne({ _id: lastBlock._id }, { $set: { otherHashChangeRefHiveBlocks: lastBlock.otherHashChangeRefHiveBlocks } }, { session: this.session }); // eslint-disable-line no-underscore-dangle
}
async getLatestBlockInfo() {

View File

@ -112,7 +112,7 @@ const produceNewBlockSync = async (block, callback = null) => {
// the stream parsed transactions from the Hive blockchain
const {
refHiveBlockNumber, refHiveBlockId, prevRefHiveBlockId,
transactions, timestamp, virtualTransactions, replay
transactions, timestamp, virtualTransactions, replay,
} = block;
const newTransactions = [];
@ -130,7 +130,8 @@ const produceNewBlockSync = async (block, callback = null) => {
});
// if there are transactions pending we produce a block
if (newTransactions.length > 0 || (virtualTransactions && virtualTransactions.length > 0) || replay) {
if (newTransactions.length > 0
|| (virtualTransactions && virtualTransactions.length > 0) || replay) {
await producePendingTransactions(
refHiveBlockNumber, refHiveBlockId, prevRefHiveBlockId, newTransactions, timestamp,
);

View File

@ -378,7 +378,7 @@ const proposeRoundHandler = async (args, callback) => {
let attempt = 1;
while (!calculatedRoundHash && attempt <= 3) {
if (attempt > 1) {
console.log("null round hash, waiting for block");
console.log('null round hash, waiting for block');
await new Promise(r => setTimeout(r, 3000));
}
calculatedRoundHash = await calculateRoundHash(startblockNum, lastBlockRound);

View File

@ -57,7 +57,6 @@ function replayFile(callback) {
refHiveBlockNumber,
refHiveBlockId,
prevRefHiveBlockId,
virtualTransactions,
} = block;
let finalRefHiveBlockId = refHiveBlockId;

View File

@ -326,7 +326,7 @@ const throttledGetBlockFromNode = async (blockNumber, node) => {
totalTime[node] += Date.now() - timeStart;
} catch (err) {
// eslint-disable-next-line no-console
console.error(`Error fetching block ${blockNumber} on node ${node}, took ${ Date.now() - timeStart } ms`);
console.error(`Error fetching block ${blockNumber} on node ${node}, took ${Date.now() - timeStart} ms`);
// eslint-disable-next-line no-console
console.error(err);
}

View File

@ -79,10 +79,12 @@ async function getHashes() {
await database.init(databaseURL, databaseName);
const contracts = database.database.collection('contracts');
const chain = database.database.collection('chain');
const localBlock = (await chain.find().sort({ _id: -1}).limit(1).toArray())[0]._id;
// eslint-disable-next-line no-underscore-dangle
const localBlock = (await chain.find().sort({ _id: -1 }).limit(1).toArray())[0]._id;
for (let i = 0; i < contractNames.length; i += 1) {
const contract = contractNames[i];
// eslint-disable-next-line no-underscore-dangle
const contractInDb = await contracts.findOne({ _id: contract });
console.log(`Checking contract ${contract}`);
const tables = hashes1[i];
@ -97,7 +99,9 @@ async function getHashes() {
}
}
}
const localBlockAfterFetch = (await chain.find().sort({ _id: -1}).limit(1).toArray())[0]._id;
// eslint-disable-next-line no-underscore-dangle
const localBlockAfterFetch = (await chain.find().sort({ _id: -1 }).limit(1).toArray())[0]._id;
console.log(`Local block before hash fetch: ${localBlock}. Block after: ${localBlockAfterFetch}`);
database.close();
}

View File

@ -21,7 +21,8 @@ function broadcastWitnessAction(contractAction, contractPayload) {
}),
};
client.broadcast.json(transaction, privateSigningKey, (x, y) => console.log(x ? x : y));
// eslint-disable-next-line no-console
client.broadcast.json(transaction, privateSigningKey, (x, y) => console.log(x || y));
}
program.version(packagejson.version);
@ -34,7 +35,7 @@ program
program
.command('register')
.action(witness => broadcastWitnessAction('register', {
.action(() => broadcastWitnessAction('register', {
IP: ip,
RPCPort: 5000,
P2PPort: 5001,
@ -44,7 +45,7 @@ program
program
.command('unregister')
.action(witness => broadcastWitnessAction('register', {
.action(() => broadcastWitnessAction('register', {
IP: ip,
RPCPort: 5000,
P2PPort: 5001,