sort witness using the same logic as in maintence

Author: Sunny Jiao

chainbase/src/main/java/org/tron/core/store/WitnessStore.java

@@ -55,7 +55,7 @@ public List<WitnessCapsule> getWitnessStandby(boolean isSortOpt) {
     return ret;
   }
 
-  public void sortWitnesses(List<WitnessCapsule> witnesses, boolean isSortOpt) {
+  public static void sortWitnesses(List<WitnessCapsule> witnesses, boolean isSortOpt) {
     witnesses.sort(Comparator.comparingLong(WitnessCapsule::getVoteCount).reversed()
         .thenComparing(isSortOpt
             ? Comparator.comparing(WitnessCapsule::createReadableString).reversed()

framework/src/main/java/org/tron/core/Wallet.java

@@ -207,6 +207,7 @@
 import org.tron.core.store.MarketPairToPriceStore;
 import org.tron.core.store.StoreFactory;
 import org.tron.core.store.VotesStore;
+import org.tron.core.store.WitnessStore;
 import org.tron.core.utils.TransactionUtil;
 import org.tron.core.vm.program.Program;
 import org.tron.core.zen.ShieldedTRC20ParametersBuilder;
@@ -797,9 +798,12 @@ public WitnessList getPaginatedNowWitnessList(long offset, long limit) {
       witnessCapsule.setVoteCount(witnessCapsule.getVoteCount() + voteCount);
     });
 
+    // Use the same logic as in the Maintenance period
+    WitnessStore.sortWitnesses(witnessCapsuleList,
+        chainBaseManager.getDynamicPropertiesStore().allowWitnessSortOptimization());
+
     // Return the witness with the highest vote counts at first and skip the offset with limit
     List<WitnessCapsule> sortedWitnessList = witnessCapsuleList.stream()
-        .sorted(Comparator.comparingLong(WitnessCapsule::getVoteCount).reversed())
         .skip(offset)
         .limit(limit)
         .collect(Collectors.toList());
@@ -837,13 +841,13 @@ private Map<ByteString, Long> countVote(VotesStore votesStore) {
         ByteString voteAddress = vote.getVoteAddress();
         long voteCount = vote.getVoteCount();
         countWitness.put(voteAddress,
-            countWitness.containsKey(voteAddress) ? countWitness.get(voteAddress) : 0 - voteCount);
+            countWitness.getOrDefault(voteAddress, 0L) - voteCount);
       });
       votes.getNewVotes().forEach(vote -> {
         ByteString voteAddress = vote.getVoteAddress();
         long voteCount = vote.getVoteCount();
         countWitness.put(voteAddress,
-            countWitness.containsKey(voteAddress) ? countWitness.get(voteAddress) : 0 + voteCount);
+            countWitness.getOrDefault(voteAddress, 0L) + voteCount);
       });
     }
     return countWitness;

framework/src/test/java/org/tron/core/db/WitnessStoreTest.java

@@ -62,12 +62,12 @@ public void testSortWitness() {
     List<ByteString> witnessAddress = allWitnesses.stream().map(WitnessCapsule::getAddress)
         .collect(Collectors.toList());
     this.witnessStore.sortWitness(witnessAddress, false);
-    this.witnessStore.sortWitnesses(allWitnesses, false);
+    WitnessStore.sortWitnesses(allWitnesses, false);
     Assert.assertEquals(witnessAddress, allWitnesses.stream().map(WitnessCapsule::getAddress)
         .collect(Collectors.toList()));
     List<ByteString> pre = new ArrayList<>(witnessAddress);
     this.witnessStore.sortWitness(witnessAddress, true);
-    this.witnessStore.sortWitnesses(allWitnesses, true);
+    WitnessStore.sortWitnesses(allWitnesses, true);
     Assert.assertEquals(witnessAddress, allWitnesses.stream().map(WitnessCapsule::getAddress)
         .collect(Collectors.toList()));
     Assert.assertNotEquals(pre, witnessAddress);