Skip to content

Commit 2bad6bd

Browse files
author
Sunny Jiao
committed
fix review
1 parent e979587 commit 2bad6bd

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

common/src/main/java/org/tron/core/config/Parameter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public class DatabaseConstants {
107107
public static final int PROPOSAL_COUNT_LIMIT_MAX = 1000;
108108
public static final int EXCHANGE_COUNT_LIMIT_MAX = 1000;
109109
public static final int MARKET_COUNT_LIMIT_MAX = 1000;
110-
public static final int WITNESS_LIST_LIMIT_MAX = 1000;
110+
public static final int WITNESS_COUNT_LIMIT_MAX = 1000;
111111
}
112112

113113
public class AdaptiveResourceLimitConstants {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static org.tron.core.config.Parameter.DatabaseConstants.EXCHANGE_COUNT_LIMIT_MAX;
3131
import static org.tron.core.config.Parameter.DatabaseConstants.MARKET_COUNT_LIMIT_MAX;
3232
import static org.tron.core.config.Parameter.DatabaseConstants.PROPOSAL_COUNT_LIMIT_MAX;
33-
import static org.tron.core.config.Parameter.DatabaseConstants.WITNESS_LIST_LIMIT_MAX;
33+
import static org.tron.core.config.Parameter.DatabaseConstants.WITNESS_COUNT_LIMIT_MAX;
3434
import static org.tron.core.services.jsonrpc.JsonRpcApiUtil.parseEnergyFee;
3535
import static org.tron.core.services.jsonrpc.TronJsonRpcImpl.EARLIEST_STR;
3636
import static org.tron.core.services.jsonrpc.TronJsonRpcImpl.FINALIZED_STR;
@@ -62,7 +62,6 @@
6262
import java.util.Objects;
6363
import java.util.Optional;
6464
import java.util.stream.Collectors;
65-
import java.util.Comparator;
6665
import lombok.Getter;
6766
import lombok.extern.slf4j.Slf4j;
6867
import org.apache.commons.lang3.ArrayUtils;
@@ -775,8 +774,8 @@ public WitnessList getPaginatedNowWitnessList(long offset, long limit) {
775774
if (limit <= 0 || offset < 0) {
776775
return null;
777776
}
778-
if (limit > WITNESS_LIST_LIMIT_MAX) {
779-
limit = WITNESS_LIST_LIMIT_MAX;
777+
if (limit > WITNESS_COUNT_LIMIT_MAX) {
778+
limit = WITNESS_COUNT_LIMIT_MAX;
780779
}
781780

782781
// Get all witnesses from the store, it contains the final vote count at the end of the last epoch.

0 commit comments

Comments
 (0)