fix count vote

Author: nanfengpo

src/main/java/org/tron/core/witness/WitnessController.java

@@ -259,30 +259,27 @@ private Map<ByteString, Long> countVote(VotesStore votesStore) {
       //    .getVoteRewardRate());
       //account.setBalance(account.getBalance() + reward);
       //accountStore.put(account.createDbKey(), account);
-      Optional<Long> sum = votes.getNewVotes().stream().map(vote -> vote.getVoteCount())
-          .reduce((a, b) -> a + b);
-      if (sum.isPresent()) { //todo: will be removed in next deployment
-        votes.getOldVotes().forEach(vote -> {
-          //TODO validate witness //active_witness
-          ByteString voteAddress = vote.getVoteAddress();
-          long voteCount = vote.getVoteCount();
-          if (countWitness.containsKey(voteAddress)) {
-            countWitness.put(voteAddress, countWitness.get(voteAddress) - voteCount);
-          } else {
-            countWitness.put(voteAddress, -voteCount);
-          }
-        });
-        votes.getNewVotes().forEach(vote -> {
-          //TODO validate witness //active_witness
-          ByteString voteAddress = vote.getVoteAddress();
-          long voteCount = vote.getVoteCount();
-          if (countWitness.containsKey(voteAddress)) {
-            countWitness.put(voteAddress, countWitness.get(voteAddress) + voteCount);
-          } else {
-            countWitness.put(voteAddress, voteCount);
-          }
-        });
-      }
+
+      votes.getOldVotes().forEach(vote -> {
+        //TODO validate witness //active_witness
+        ByteString voteAddress = vote.getVoteAddress();
+        long voteCount = vote.getVoteCount();
+        if (countWitness.containsKey(voteAddress)) {
+          countWitness.put(voteAddress, countWitness.get(voteAddress) - voteCount);
+        } else {
+          countWitness.put(voteAddress, -voteCount);
+        }
+      });
+      votes.getNewVotes().forEach(vote -> {
+        //TODO validate witness //active_witness
+        ByteString voteAddress = vote.getVoteAddress();
+        long voteCount = vote.getVoteCount();
+        if (countWitness.containsKey(voteAddress)) {
+          countWitness.put(voteAddress, countWitness.get(voteAddress) + voteCount);
+        } else {
+          countWitness.put(voteAddress, voteCount);
+        }
+      });
 
 
       sizeCount++;