Skip to content

Commit d717a21

Browse files
committed
modify queryNowTotalVoteNumber method
1 parent 22c7ad1 commit d717a21

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2578,10 +2578,10 @@ public double queryNowVoteNumber(byte[] address) {
25782578

25792579
public double queryNowTotalVoteNumber() {
25802580
AtomicLong voteNumber = new AtomicLong();
2581-
List<WitnessCapsule> allWitnesses = dbManager.getWitnessStore().getAllWitnesses();
2581+
List<ByteString> allWitnesses = getStandbyWitness();
25822582
allWitnesses.forEach(witness -> {
25832583
voteNumber.addAndGet(dbManager.getWitnessStore()
2584-
.get(witness.getAddress().toByteArray()).getVoteCount());
2584+
.get(witness.toByteArray()).getVoteCount());
25852585
});
25862586
return voteNumber.doubleValue();
25872587
}
@@ -2843,7 +2843,7 @@ public boolean existAddress(byte[] address) {
28432843
return false;
28442844
}
28452845

2846-
public boolean checkStandbyWitness(byte[] address) {
2846+
public List<ByteString> getStandbyWitness() {
28472847
List<ByteString> witnessAddressList = new ArrayList<>();
28482848
for (WitnessCapsule witnessCapsule : consensusDelegate.getAllWitnesses()) {
28492849
witnessAddressList.add(witnessCapsule.getAddress());
@@ -2856,7 +2856,12 @@ public boolean checkStandbyWitness(byte[] address) {
28562856
if (witnessAddressList.size() > WITNESS_STANDBY_LENGTH) {
28572857
witnessAddressList = witnessAddressList.subList(0, WITNESS_STANDBY_LENGTH);
28582858
}
2859-
boolean contains = witnessAddressList.contains(ByteString.copyFrom(address));
2859+
return witnessAddressList;
2860+
2861+
}
2862+
2863+
public boolean checkStandbyWitness(byte[] address) {
2864+
boolean contains = getStandbyWitness().contains(ByteString.copyFrom(address));
28602865
return contains;
28612866
}
28622867
}

0 commit comments

Comments
 (0)