tests(Chain): tests for individual phase durations

Author: DZariusz

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+###Changed
+- Each phase has its own duration
+
 ## [0.5.1] - 2020-01-27
 ### Changed
 - when updating contract via `ContractRegistry`, old `Chain` contract is not killed

config/development.json

@@ -10,7 +10,8 @@
     "verifiersPerShard": "10"
   },
   "Chain": {
-    "blocksPerPhase": "10",
+    "blocksPerPropose": "100",
+    "blocksPerReveal": "10",
     "minimumStakingTokenPercentage": "70"
   },
   "ContractRegistry": {

config/production.json

@@ -11,7 +11,8 @@
   },
   "Chain": {
     "verifierRegistryAddress": "0x614cb086657c47739068c12eeff43a4018be1190",
-    "blocksPerPhase": "10",
+    "blocksPerPropose": "100",
+    "blocksPerReveal": "10",
     "minimumStakingTokenPercentage": "70"
   },
   "ContractRegistry": {

config/staging.json

@@ -11,7 +11,8 @@
   },
   "Chain": {
     "verifierRegistryAddress": "0xd209f28511f37e3e975d4631b7cfa2f52ffabcef",
-    "blocksPerPhase": "10",
+    "blocksPerPropose": "100",
+    "blocksPerReveal": "10",
     "minimumStakingTokenPercentage": "70"
   },
   "ContractRegistry": {

migrations/2.0_deploy_chain_storage.js

@@ -7,7 +7,8 @@ module.exports = (deployer, network, accounts) => {
 
   return deployer.deploy(
     ChainStorageArtifact,
-    config.Chain.blocksPerPhase,
+    config.Chain.blocksPerPropose,
+    config.Chain.blocksPerReveal,
     config.Chain.minimumStakingTokenPercentage,
     false,
     options,

migrations/deployers/ChainStorage.js

@@ -10,7 +10,8 @@ module.exports = (
 
   return deployer.deploy(
     ChainStorageArtifact,
-    config.Chain.blocksPerPhase,
+    config.Chain.blocksPerPropose,
+    config.Chain.blocksPerReveal,
     config.Chain.minimumStakingTokenPercentage,
     false,
     options,

test/helpers/CycleFunctions.js

@@ -1,25 +1,29 @@
-function blockOfCycle(currentBlock, phaseDuration) {
-  return currentBlock % (phaseDuration * 2);
+function blockOfCycle(currentBlock, cycleDuration) {
+  return currentBlock % cycleDuration;
 }
 
-function isProposePhase(currentBlock, phaseDuration) {
-  return blockOfCycle(currentBlock, phaseDuration) < phaseDuration;
+function isProposePhase(currentBlock, proposePhaseDuration, revealPhaseDuration) {
+  const cycleBlock = blockOfCycle(currentBlock, proposePhaseDuration + revealPhaseDuration);
+  return cycleBlock < proposePhaseDuration;
 }
 
-function isRevealPhase(currentBlock, phaseDuration) {
-  return !isProposePhase(currentBlock, phaseDuration);
+function isRevealPhase(currentBlock, proposePhaseDuration, revealPhaseDuration) {
+  return !isProposePhase(currentBlock, proposePhaseDuration, revealPhaseDuration);
 }
 
-function blocksToWaitForPropose(currentBlock, phaseDuration) {
-  if (isProposePhase(currentBlock, phaseDuration)) return 0;
+function blocksToWaitForPropose(currentBlock, proposePhaseDuration, revealPhaseDuration) {
+  if (isProposePhase(currentBlock, proposePhaseDuration, revealPhaseDuration)) return 0;
 
-  return (phaseDuration * 2) - blockOfCycle(currentBlock, phaseDuration);
+  // +1 because we want to be in first block in a phase
+  return (proposePhaseDuration + revealPhaseDuration + 1) -
+    blockOfCycle(currentBlock, proposePhaseDuration + revealPhaseDuration);
 }
 
-function blocksToWaitForReveal(currentBlock, phaseDuration) {
-  if (isRevealPhase(currentBlock, phaseDuration)) return 0;
+function blocksToWaitForReveal(currentBlock, proposePhaseDuration, revealPhaseDuration) {
+  if (isRevealPhase(currentBlock, proposePhaseDuration, revealPhaseDuration)) return 0;
 
-  return phaseDuration - blockOfCycle(currentBlock, phaseDuration);
+  return proposePhaseDuration -
+    blockOfCycle(currentBlock, proposePhaseDuration + revealPhaseDuration);
 }
 
 export {

test/helpers/SpecHelper.js

@@ -37,6 +37,8 @@ const advanceToBlock = async (number) => {
   const blockNumber = await web3.eth.getBlockNumber();
   if (blockNumber > number) {
     throw Error(`block number ${number} is in the past (current is ${blockNumber})`);
+  } else if (blockNumber === number) {
+    return Promise.resolve();
   }
 
   const awaits = [];
@@ -50,30 +52,32 @@ const advanceToBlock = async (number) => {
   return Promise.all(awaits);
 };
 
-const mineUntilPropose = async (phaseDuration) => {
+const mineUntilPropose = async (proposePhaseDuration, revealPhaseDuration) => {
   const blockNumber = await web3.eth.getBlockNumber();
+
   const toMine =
-    blocksToWaitForPropose(blockNumber, phaseDuration);
+    blocksToWaitForPropose(blockNumber, proposePhaseDuration, revealPhaseDuration);
 
   const prosalStartBlockNumber = new BigNumber(blockNumber).plus(toMine);
 
   await advanceToBlock(prosalStartBlockNumber.toNumber());
 };
 
-const mineUntilReveal = async (phaseDuration) => {
+const mineUntilReveal = async (proposePhaseDuration, revealPhaseDuration) => {
   const blockNumber = await web3.eth.getBlockNumber();
+
   const toMine =
-    blocksToWaitForReveal(blockNumber, phaseDuration);
+    blocksToWaitForReveal(blockNumber, proposePhaseDuration, revealPhaseDuration);
 
   const revealStartBlockNumber = new BigNumber(blockNumber).plus(toMine);
   await advanceToBlock(revealStartBlockNumber.toNumber());
 };
 
-const getBlockHeight = async (phaseDuration) => {
+const getBlockHeight = async (proposePhaseDuration, revealPhaseDuration) => {
   const blockNumber = await web3.eth.getBlockNumber();
+
   return BigNumber(blockNumber)
-    .div(phaseDuration, 10)
-    .div(2, 10)
+    .div(parseInt(proposePhaseDuration, 10) + parseInt(revealPhaseDuration, 10), 10)
     .toString(10)
     .split('.')[0];
 };

test/helpers/deployers.js

@@ -21,12 +21,16 @@ async function deployVerifierRegistry(owner, contractRegistryAddr) {
 
 async function deployChain(
   owner, verifiersAddr,
-  blocksPerPhase, minimumStakingTokenPercentage, updateMinimumStakingTokenPercentageEnabled,
+  blocksPerPropose,
+  blocksPerReveal,
+  minimumStakingTokenPercentage,
+  updateMinimumStakingTokenPercentageEnabled,
 ) {
   const contractRegistry = await deployContractRegistry();
 
   const chainStorageInstance = await ChainStorageArtifact.new(
-    blocksPerPhase,
+    blocksPerPropose,
+    blocksPerReveal,
     minimumStakingTokenPercentage,
     updateMinimumStakingTokenPercentageEnabled,
   );

test/integration/TestActiveVerifiers.js

@@ -13,7 +13,8 @@ const {
 } = require('../helpers/deployers');
 
 const verifiersCount = 3;
-const phaseDuration = 5 * verifiersCount * 2;
+const proposePhaseDuration = 5 * verifiersCount * 2;
+const revealPhaseDuration = 5 * verifiersCount * 2;
 const requirePercentOfTokens = 70;
 
 contract('Chain: testing active/non active verifiers', (accounts) => {
@@ -27,7 +28,7 @@ contract('Chain: testing active/non active verifiers', (accounts) => {
 
   before(async () => {
     ministroChain = await deployChain(
-      accounts[0], verifiersAddr, phaseDuration,
+      accounts[0], verifiersAddr, proposePhaseDuration, revealPhaseDuration,
       requirePercentOfTokens, true,
     );
 
@@ -49,12 +50,12 @@ contract('Chain: testing active/non active verifiers', (accounts) => {
 
     describe('when we are in propose phase', async () => {
       before(async () => {
-        await mineUntilPropose(phaseDuration);
+        await mineUntilPropose(proposePhaseDuration, revealPhaseDuration);
       });
 
       it('should NOT be possible to propose', async () => {
         const awaits = [];
-        const blockHeight = await getBlockHeight(phaseDuration);
+        const blockHeight = await getBlockHeight(proposePhaseDuration, revealPhaseDuration);
         for (let i = 0; i < verifiersCount; i += 1) {
           awaits.push(ministroChain.propose(
             blindedProposals[i],
@@ -80,12 +81,12 @@ contract('Chain: testing active/non active verifiers', (accounts) => {
 
         describe('when we are in propose phase', async () => {
           before(async () => {
-            await mineUntilPropose(phaseDuration);
+            await mineUntilPropose(proposePhaseDuration, revealPhaseDuration);
           });
 
           it('should be possible to propose', async () => {
             const awaits = [];
-            const blockHeight = await getBlockHeight(phaseDuration);
+            const blockHeight = await getBlockHeight(proposePhaseDuration, revealPhaseDuration);
 
             for (let i = 0; i < verifiersCount; i += 1) {
               awaits.push(ministroChain.propose(
@@ -110,7 +111,7 @@ contract('Chain: testing active/non active verifiers', (accounts) => {
 
             describe('they should be able to finish election and reveal vote', async () => {
               before(async () => {
-                await mineUntilReveal(phaseDuration);
+                await mineUntilReveal(proposePhaseDuration, revealPhaseDuration);
               });
 
               it('should be possible to reveal', async () => {