Merge pull request #480 from aguycalled/fix-rpc-tests

Fix RPC Tests

Author: proletesseract

qa/rpc-tests/cfund-rawtx-create-proposal.py

@@ -196,7 +196,6 @@ def test_happy_path(self):
 
     def check_good_proposal(self, proposal):
 
-        assert (proposal['votingCycle'] == 0)
         assert (proposal['version'] == 2)
         assert (proposal['paymentAddress'] == self.goodAddress)
         assert (proposal['proposalDuration'] == self.goodDuration)

src/chainparams.cpp

@@ -473,7 +473,7 @@ class CDevNetParams : public CChainParams {
         consensus.nModifierInterval = 10 * 60; // time to elapse before new modifier is computed
         consensus.nTargetTimespan = 25 * 30;
         consensus.nLastPOWBlock = 100000;
-        consensus.nBlocksPerVotingCycle = 180; // 1.5 hours
+        consensus.nBlocksPerVotingCycle = 30; // 15 minutes
         consensus.nMinimumQuorum = 0.5;
         consensus.nMinimumQuorumFirstHalf = 0.5;
         consensus.nMinimumQuorumSecondHalf = 0.4;
@@ -570,13 +570,13 @@ class CDevNetParams : public CChainParams {
         // 2) Rebuild
         // 3) Launch daemon. It'll calculate the new parameters.
         // 4) Update the following variables with the new values:
-        uint256 hashGenesisBlock = uint256S("0x0000e01b12644af6917e5aada637a609dd9590ad6bdc4828cd8df95258d85c02");
+        uint256 hashGenesisBlock = uint256S("0x0000971c241a5a1b8462c3cb8d455f0493043eb37c7163f88c658c70aa689929");
         uint256 hashMerkleRoot = uint256S("0x2d9101b87fe7b9deaea41849c1f3bed71e060739147802a238fe968f75ad0fd9");
-        uint32_t nNonce = 2043184832;
+        uint32_t nNonce = 2043198879;
         // 5) Rebuild. Launch daemon.
         // 6) Generate first block using RPC command "./navcoin-cli generate 1"
 
-        genesis = CreateGenesisBlockTestnet(nTimestamp, nNonce, 0x1d00ffff, 1, 0);
+        genesis = CreateGenesisBlockTestnet(nTimestamp, nNonce, 0xffffffff, 1, 0);
         consensus.hashGenesisBlock = genesis.GetHash();
 
         if (true && (genesis.GetHash() != hashGenesisBlock || genesis.hashMerkleRoot != hashMerkleRoot))