This repository has been archived by the owner on Jun 11, 2024. It is now read-only.
Add functional test coverage for rounds system - Closes #1303 #1747
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Copyright © 2018 Lisk Foundation | ||
| * | ||
| * See the LICENSE file at the top-level directory of this distribution | ||
| * for licensing information. | ||
| * | ||
| * Unless otherwise agreed in a custom licensing agreement with the Lisk Foundation, | ||
| * no part of this software, including this file, may be copied, modified, | ||
| * propagated, or distributed except according to the terms contained in the | ||
| * LICENSE file. | ||
| * | ||
| * Removal or modification of this copyright notice is prohibited. | ||
| */ | ||
|
|
||
| WITH balances AS ( | ||
| -- Subtract amount and fee from sender accounts | ||
| (SELECT UPPER("senderId") AS address, -SUM(amount+fee) AS amount FROM trs GROUP BY UPPER("senderId")) | ||
| UNION ALL | ||
| -- Credit amount to recipient accounts | ||
| (SELECT UPPER("recipientId") AS address, SUM(amount) AS amount FROM trs WHERE "recipientId" IS NOT NULL GROUP BY UPPER("recipientId")) | ||
| UNION ALL | ||
| -- Sum total rewards (fee split + block reward) from all rounds, for all delegates accounts | ||
| (SELECT a.address, r.amount FROM | ||
| (SELECT r."publicKey", SUM(r.fees) + SUM(r.reward) AS amount FROM rounds_rewards r GROUP BY r."publicKey") r LEFT JOIN mem_accounts a ON r."publicKey" = a."publicKey" | ||
| ) | ||
| ), | ||
| -- Sum all calculated accounts balances | ||
| accounts AS (SELECT b.address, SUM(b.amount) AS balance FROM balances b GROUP BY b.address) | ||
| -- Compare calculated (based on blockchain) balances with current accounts balances (mem_accounbts) | ||
| SELECT m.address, ENCODE(m."publicKey", 'hex') AS "publicKey", m.username, a.balance::BIGINT AS blockchain, m.balance::BIGINT AS memory, (m.balance-a.balance)::BIGINT AS diff | ||
|
There was a problem hiding this comment. Does not it look odd There was a problem hiding this comment. Added comments for clarification. |
||
| FROM accounts a LEFT JOIN mem_accounts m ON a.address = m.address WHERE a.balance <> m.balance; | ||
|
There was a problem hiding this comment. Would be nice to explain to explain this SQL in comments above. What I understood.
Can you explain the third point? Why we sump up fees with rewards, while fee already covered in the first point. There was a problem hiding this comment. It works a little different:
I'll add some comments to that query. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,7 +51,7 @@ function createBlock(library, transactions, timestamp, keypair, previousBlock) { | |
| function createValidBlock(library, transactions, cb) { | ||
| var lastBlock = library.modules.blocks.lastBlock.get(); | ||
| var slot = slots.getSlotNumber(); | ||
| var keypairs = library.modules.delegates.getForgersKeyPairs(); | ||
| getDelegateForSlot(library, slot, (err, delegateKey) => { | ||
| var block = createBlock( | ||
| library, | ||
|
|
@@ -79,15 +79,15 @@ function getBlocks(library, cb) { | |
| }); | ||
| } | ||
|
|
||
| function getNextForger(library, offset, cb) { | ||
| offset = !offset ? 1 : offset; | ||
|
|
||
| var lastBlock = library.modules.blocks.lastBlock.get(); | ||
| var slot = slots.getSlotNumber(lastBlock.timestamp); | ||
| getDelegateForSlot(library, slot + offset, cb); | ||
| } | ||
|
|
||
| function forge(library, cb) { | ||
| var keypairs = library.rewiredModules.delegates.__get__('__private.keypairs'); | ||
|
There was a problem hiding this comment. Maybe |
||
|
|
||
| async.waterfall( | ||
|
|
@@ -96,7 +96,7 @@ function forge(library, cb) { | |
| fillPool(library, seriesCb); | ||
| }, | ||
| function(seriesCb) { | ||
| getNextForger(library, null, seriesCb); | ||
| }, | ||
| function(delegate, seriesCb) { | ||
| var last_block = library.modules.blocks.lastBlock.get(); | ||
|
|
@@ -145,6 +145,9 @@ function fillPool(library, cb) { | |
| function addTransaction(library, transaction, cb) { | ||
| // Add transaction to transactions pool - we use shortcut here to bypass transport module, but logic is the same | ||
| // See: modules.transport.__private.receiveTransaction | ||
| __testContext.debug(` Add transaction ID: ${transaction.id}`); | ||
|
|
||
| transaction = library.logic.transaction.objectNormalize(transaction); | ||
| library.balancesSequence.add(sequenceCb => { | ||
| library.modules.transactions.processUnconfirmedTransaction( | ||
| transaction, | ||
|
|
@@ -177,7 +180,12 @@ function addTransactionToUnconfirmedQueue(library, transaction, cb) { | |
| ); | ||
| } | ||
|
|
||
| function addTransactionsAndForge(library, transactions, forgeDelay, cb) { | ||
| if (typeof forgeDelay === 'function') { | ||
| cb = forgeDelay; | ||
| forgeDelay = 800; | ||
|
There was a problem hiding this comment. Why we need to support that delay here? There was a problem hiding this comment. @4miners As per @SargeKhan it was added because of transaction pool. He can explain further on it. |
||
| } | ||
|
|
||
| async.waterfall( | ||
| [ | ||
| function addTransactions(waterCb) { | ||
|
|
@@ -190,9 +198,13 @@ function addTransactionsAndForge(library, transactions, cb) { | |
| ); | ||
| }, | ||
| function(waterCb) { | ||
| if (forgeDelay > 0) { | ||
| setTimeout(() => { | ||
| forge(library, waterCb); | ||
| }, forgeDelay); | ||
| } else { | ||
| setImmediate(forge, library, waterCb); | ||
| } | ||
| }, | ||
| ], | ||
| err => { | ||
|
|
@@ -334,6 +346,7 @@ function loadTransactionType(key, account, dapp, secondPassword, cb) { | |
| } | ||
|
|
||
| module.exports = { | ||
| getNextForger, | ||
| forge, | ||
| fillPool, | ||
| addTransaction, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't understand the use of empty const object as fixture.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not an empty object, we add properties to it later.