error optimization for validator sc (#89)

error optimization for validator sc

Author: GalaxySciTech

consensus/tests/engine_v2_tests/adaptor_test.go

@@ -30,7 +30,7 @@ func TestAdaptorShouldGetAuthorForDifferentConsensusVersion(t *testing.T) {
 	// Insert one more block to make it above 10, which means now we are on v2 of consensus engine
 	// Insert block 901
 
-	merkleRoot := "4de5b7decb41a4aa648140d0fecb169bd22f07e92be20cf63397111f48653bdc"
+	merkleRoot := "b3e34cf1d3d80bcd2c5add880842892733e45979ddaf16e531f660fdf7ca5787"
 	header := &types.Header{
 		Root:       common.HexToHash(merkleRoot),
 		Number:     big.NewInt(int64(901)),

consensus/tests/engine_v2_tests/helper.go

@@ -567,7 +567,7 @@ func PrepareXDCTestBlockChainWith128Candidates(t *testing.T, numOfBlocks int, ch
 			blockCoinBase = signer.Hex()
 		}
 		roundNumber := int64(i) - chainConfig.XDPoS.V2.SwitchBlock.Int64()
-		block := CreateBlock(blockchain, chainConfig, currentBlock, i, roundNumber, blockCoinBase, signer, signFn, nil, nil, "10f2c00fef7093f265fde39c806f17aaea50a2093ca68ab795462021c38fd4b0")
+		block := CreateBlock(blockchain, chainConfig, currentBlock, i, roundNumber, blockCoinBase, signer, signFn, nil, nil, "c2bf7b59be5184fc1148be5db14692b2dc89a1b345895d3e8d0ee7b8a7607450")
 		err = blockchain.InsertBlock(block)
 		if err != nil {
 			t.Fatal(err)
@@ -609,7 +609,7 @@ func PrepareQCandProcess(t *testing.T, blockchain *BlockChain, currentBlock *typ
 func CreateBlock(blockchain *BlockChain, chainConfig *params.ChainConfig, startingBlock *types.Block, blockNumber int, roundNumber int64, blockCoinBase string, signer common.Address, signFn func(account accounts.Account, hash []byte) ([]byte, error), penalties []common.Address, signersKey []*ecdsa.PrivateKey, merkleRoot string) *types.Block {
 	currentBlock := startingBlock
 	if len(merkleRoot) == 0 {
-		merkleRoot = "4de5b7decb41a4aa648140d0fecb169bd22f07e92be20cf63397111f48653bdc"
+		merkleRoot = "b3e34cf1d3d80bcd2c5add880842892733e45979ddaf16e531f660fdf7ca5787"
 	}
 	var header *types.Header
 	statedb, err := blockchain.State()

consensus/tests/engine_v2_tests/mine_test.go

@@ -28,7 +28,7 @@ func TestYourTurnInitialV2(t *testing.T) {
 	t.Logf("Inserting block with propose at 11...")
 	blockCoinbaseA := "0xaaa0000000000000000000000000000000000011"
 	//Get from block validator error message
-	merkleRoot := "4de5b7decb41a4aa648140d0fecb169bd22f07e92be20cf63397111f48653bdc"
+	merkleRoot := "b3e34cf1d3d80bcd2c5add880842892733e45979ddaf16e531f660fdf7ca5787"
 	extraInBytes := generateV2Extra(11, parentBlock, signer, signFn, nil)
 
 	header := &types.Header{
@@ -79,7 +79,7 @@ func TestShouldMineOncePerRound(t *testing.T) {
 	_, err := adaptor.Seal(blockchain, block910, nil)
 	assert.Nil(t, err)
 	time.Sleep(time.Duration(minePeriod) * time.Second)
-	merkleRoot := "4de5b7decb41a4aa648140d0fecb169bd22f07e92be20cf63397111f48653bdc"
+	merkleRoot := "b3e34cf1d3d80bcd2c5add880842892733e45979ddaf16e531f660fdf7ca5787"
 
 	header := &types.Header{
 		Root:       common.HexToHash(merkleRoot),
@@ -128,7 +128,7 @@ func TestUpdateMasterNodes(t *testing.T) {
 		t.Fatal(err)
 	}
 	//Get from block validator error message
-	merkleRoot := "238cda75adb6630d1b7ac209012cc95f258fb84fa2b7a14e1c02a092955fc73d"
+	merkleRoot := "42970e0f2265db7d85d0d9cd7328d58bd53bdb54d85d7997e95a1c3f60845602"
 	header := &types.Header{
 		Root:       common.HexToHash(merkleRoot),
 		Number:     big.NewInt(int64(1350)),
@@ -270,7 +270,7 @@ func TestUpdateMultipleMasterNodes(t *testing.T) {
 	t.Logf("Inserting block with propose at 1350...")
 	blockCoinbaseA := "0xaaa0000000000000000000000000000000001350"
 	//Get from block validator error message
-	merkleRoot := "10f2c00fef7093f265fde39c806f17aaea50a2093ca68ab795462021c38fd4b0"
+	merkleRoot := "c2bf7b59be5184fc1148be5db14692b2dc89a1b345895d3e8d0ee7b8a7607450"
 	parentBlock := CreateBlock(blockchain, config, currentBlock, 1350, 450, blockCoinbaseA, signer, signFn, nil, nil, merkleRoot)
 	err := blockchain.InsertBlock(parentBlock)
 	assert.Nil(t, err)

consensus/tests/engine_v2_tests/penalty_test.go

@@ -38,7 +38,7 @@ func TestHookPenaltyV2TwoEpoch(t *testing.T) {
 	header1335 := blockchain.GetHeaderByNumber(config.XDPoS.Epoch + config.XDPoS.Gap - uint64(common.MergeSignRange))
 	tx, err := signingTxWithKey(header1335, 0, voterKey)
 	assert.Nil(t, err)
-	block1349 := CreateBlock(blockchain, conf, block1348, 1349, 1358, signer.Hex(), signer, signFn, nil, nil, "10f2c00fef7093f265fde39c806f17aaea50a2093ca68ab795462021c38fd4b0")
+	block1349 := CreateBlock(blockchain, conf, block1348, 1349, 1358, signer.Hex(), signer, signFn, nil, nil, "c2bf7b59be5184fc1148be5db14692b2dc89a1b345895d3e8d0ee7b8a7607450")
 	err = blockchain.InsertBlock(block1349)
 	assert.Nil(t, err)
 	adaptor.CacheSigningTxs(block1349.Hash(), []*types.Transaction{tx})

consensus/tests/engine_v2_tests/verify_header_test.go

@@ -77,7 +77,7 @@ func TestShouldVerifyBlock(t *testing.T) {
 	err = adaptor.VerifyHeader(blockchain, invalidPenaltiesExistBlock, true)
 	assert.Equal(t, utils.ErrInvalidFieldInNonGapPlusOneSwitch, err)
 
-	merkleRoot := "4de5b7decb41a4aa648140d0fecb169bd22f07e92be20cf63397111f48653bdc"
+	merkleRoot := "b3e34cf1d3d80bcd2c5add880842892733e45979ddaf16e531f660fdf7ca5787"
 	parentNotExistBlock := blockchain.GetBlockByNumber(901).Header()
 	parentNotExistBlock.ParentHash = common.HexToHash(merkleRoot)
 	err = adaptor.VerifyHeader(blockchain, parentNotExistBlock, true)

contracts/validator/contract/validator.go

@@ -52,81 +52,75 @@ contract XDCValidator {
 
     modifier onlyValidCandidateCap() {
         // anyone can deposit X XDC to become a candidate
-        require(msg.value >= minCandidateCap, "onlyValidCandidateCap");
+        require(msg.value >= minCandidateCap, "Low Candidate Cap");
         _;
     }
 
     modifier onlyValidVoterCap() {
-        require(msg.value >= minVoterCap, "onlyValidVoterCap");
+        require(msg.value >= minVoterCap, "Low Voter Cap");
         _;
     }
 
     modifier onlyKYCWhitelisted() {
         require(
             kycString[msg.sender].length != 0 ||
                 ownerToCandidate[msg.sender].length > 0,
-            "onlyKYCWhitelisted"
+            "Not KYC Whitelisted"
         );
         _;
     }
 
     modifier onlyOwner(address _candidate) {
-        require(validatorsState[_candidate].owner == msg.sender, "onlyOwner");
+        require(validatorsState[_candidate].owner == msg.sender, "Not Owner");
         _;
     }
 
     modifier onlyCandidate(address _candidate) {
-        require(validatorsState[_candidate].isCandidate, "onlyCandidate");
+        require(validatorsState[_candidate].isCandidate, "Not Candidate");
         _;
     }
 
     modifier onlyValidCandidate(address _candidate) {
-        require(validatorsState[_candidate].isCandidate, "onlyValidCandidate");
+        require(validatorsState[_candidate].isCandidate, "Not Valid Candidate");
         _;
     }
 
     modifier onlyNotCandidate(address _candidate) {
-        require(!validatorsState[_candidate].isCandidate, "onlyNotCandidate");
+        require(!validatorsState[_candidate].isCandidate, "Already Candidate");
         _;
     }
 
     modifier onlyValidVote(address _candidate, uint256 _cap) {
         require(
             validatorsState[_candidate].voters[msg.sender] >= _cap,
-            "onlyValidVote validatorsState[_candidate].voters[msg.sender] >= _cap is false"
+            "Insufficient Vote Cap"
         );
         if (validatorsState[_candidate].owner == msg.sender) {
             require(
                 validatorsState[_candidate].voters[msg.sender].sub(_cap) >=
                     minCandidateCap,
-                "onlyValidVote validatorsState[_candidate].voters[msg.sender] - (_cap) >= minCandidateCap is false"
+                "Below Min Cap"
             );
         }
         _;
     }
 
     modifier onlyValidWithdraw(uint256 _blockNumber, uint256 _index) {
-        require(
-            _blockNumber > 0,
-            "onlyValidWithdraw _blockNumber > 0 is false"
-        );
-        require(
-            block.number >= _blockNumber,
-            "onlyValidWithdraw block.number >= _blockNumber is false"
-        );
+        require(_blockNumber > 0, "Invalid Block Number");
+        require(block.number >= _blockNumber, "Block Number Too High");
         require(
             withdrawsState[msg.sender].caps[_blockNumber] > 0,
-            "onlyValidWithdraw withdrawsState[msg.sender].caps[_blockNumber] > 0 is false"
+            "Invalid Withdraw Cap"
         );
         require(
             withdrawsState[msg.sender].blockNumbers[_index] == _blockNumber,
-            "onlyValidWithdraw withdrawsState[msg.sender].blockNumbers[_index] == _blockNumber is false"
+            "Mismatch Block Number"
         );
         _;
     }
 
     modifier onlyGrandMaster() {
-        require(grandMasterMap[msg.sender] == true, "onlyGrandMaster");
+        require(grandMasterMap[msg.sender] == true, "Not Grand Master");
         _;
     }
 
@@ -313,10 +307,7 @@ contract XDCValidator {
     }
 
     function checkMinCandidateNum() private view {
-        require(
-            candidates.length >= minCandidateNum,
-            "cadidates must greater than minCandidateNum"
-        );
+        require(candidates.length >= minCandidateNum, "Low Candidate Count");
     }
 
     // voteInvalidKYC : any candidate can vote for invalid KYC i.e. a particular candidate's owner has uploaded a bad KYC.
@@ -332,7 +323,7 @@ contract XDCValidator {
         address _invalidMasternode = getCandidateOwner(_invalidCandidate);
         require(
             !hasVotedInvalid[candidateOwner][_invalidMasternode],
-            "!hasVotedInvalid[candidateOwner][_invalidMasternode]"
+            "Already Voted Invalid"
         );
         hasVotedInvalid[candidateOwner][_invalidMasternode] = true;
         invalidKYCCount[_invalidMasternode]++;