Changed pause and unpause proposal

somish · Sep 10, 2018 · 23a327c · 23a327c
1 parent 428b1dd
commit 23a327c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/contracts/GovernanceData.sol b/contracts/GovernanceData.sol
@@ -311,15 +311,16 @@ contract GovernanceData is Upgradeable { //solhint-disable-line
         }
     }
 
-    /// @dev pauses or resumes a proposal
-    /// @param pause true = pause proposal, false = resume
-    function toggleProposalPause(bool pause, uint _proposalId) public onlyInternal {
-        if (pause && !proposalPaused[_proposalId])
-            proposalPaused[_proposalId] = true;
-        else if (!pause && proposalPaused[_proposalId]) {
-            proposalPaused[_proposalId] = false;
-            allProposal[_proposalId].dateUpd = now; //solhint-disable-line
-        }
+    /// @dev resume a proposal
+    function resumeProposal(uint _proposalId) public onlyInternal {
+        require(proposalPaused[_proposalId]);
+        proposalPaused[_proposalId] = false;
+        allProposal[_proposalId].dateUpd = now; //solhint-disable-line
+    }
+
+    /// @dev pause a proposal
+    function pauseProposal(uint _proposalId) public onlyInternal {
+        proposalPaused[_proposalId] = true;
     }
 
     /// @dev Gets Total number of voting types has been added till now.

diff --git a/contracts/ProposalCategory.sol b/contracts/ProposalCategory.sol
@@ -64,8 +64,8 @@ contract ProposalCategory is Governed {
         allCategory.push(Category("Categories", rs, mv, al, ct));
         allCategory.push(Category("Parameters", rs, mv, al, ct));
         allCategory.push(Category("Transfer Assets", rs, mv, alab, ct));
-        allCategory.push(Category("New contracts", rs, mv, al, ct));
-        allCategory.push(Category("Proposals", rs, mv, al, ct));
+        allCategory.push(Category("Critical Actions", rs, mv, al, ct));
+        allCategory.push(Category("Immediate Actions", rs, mv, al, ct));
         allCategory.push(Category("Others", rs, mv, al, ct));
     }
 

diff --git a/contracts/ProposalCategoryAdder.sol b/contracts/ProposalCategoryAdder.sol
@@ -105,17 +105,17 @@ contract ProposalCategoryAdder {
             rewardPerc
         );
         proposalCategory.addInitialSubC(
-            "Pause Proposal",
-            "QmPh5j3aAPhC6VZ8snjwLWPtR7Ps3os8zdYERTtp5W6RAp",
-            6,
+            "Resume Proposal",
+            "QmSDojLprBLDrPqF7HAaDCdi2Hy129LBwzfRMKhkt2begC",
+            5,
             address(0),
             "GD",
             stakeInecntive,
             rewardPerc
         );
         proposalCategory.addInitialSubC(
-            "Resume Proposal",
-            "QmSDojLprBLDrPqF7HAaDCdi2Hy129LBwzfRMKhkt2begC",
+            "Pause Proposal",
+            "QmPh5j3aAPhC6VZ8snjwLWPtR7Ps3os8zdYERTtp5W6RAp",
             6,
             address(0),
             "GD",

diff --git a/test/12_GovernanceData.js b/test/12_GovernanceData.js
@@ -152,12 +152,12 @@ contract('Governance Data', function([owner, notOwner]) {
 
   it('Should pause unpause proposal', async function() {
     this.timeout(100000);
-    await gd.toggleProposalPause(true, 0);
-    await gd.toggleProposalPause(true, 0);
-    let p1 = await gd.proposalPaused(0);
-    await gd.toggleProposalPause(false, 0);
-    let p2 = await gd.proposalPaused(0);
-    assert.notEqual(p1, p2, 'proposal not paused unpaused properly');
+    await gd.pauseProposal(0);
+    const p1 = await gd.proposalPaused(0);
+    assert.equal(p1, true);
+    await gd.resumeProposal(0);
+    const p2 = await gd.proposalPaused(0);
+    assert.equal(p2, false);
   });
 
   it('Should change parameters', async function() {