mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-13 11:09:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sum merit in outer loop to speed up VoteResultView.getVotingHistoryJson

Browse source 
Avoid needlessly repetitive (once per cycle proposal) signature checking
of each 'Merit' object in the DAO state, when exporting the voting
history JSON, by moving the merit calculations to the outer loop over
each cycle, storing the sums in a map by blind vote txId. As signature
verification is expensive, taking seconds to run just once over every
'Merit' object, this is by far the biggest bottleneck when generating
the JSON.
This commit is contained in:
Steven Barclay 2024-05-06 20:17:09 +02:00
parent 34ed5e0f74
commit 57662ae206
No known key found for this signature in database
GPG key ID: 9FED6BF1176D500B
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java
View file

@ -882,6 +882,12 @@ public class VoteResultView extends ActivatableView<GridPane, Void> implements D
cycleJson.addProperty("totalAcceptedVotes", cycleListItem.getResultsOfCycle().getNumAcceptedVotes());
cycleJson.addProperty("totalRejectedVotes", cycleListItem.getResultsOfCycle().getNumRejectedVotes());
List<DecryptedBallotsWithMerits> decryptedVotesForCycle = cycleListItem.getResultsOfCycle().getDecryptedVotesForCycle();
// Make sure the votes are sorted so we can easier compare json files from different users
decryptedVotesForCycle.sort(Comparator.comparing(DecryptedBallotsWithMerits::getBlindVoteTxId));
Map<String, Long> meritStakeMap = decryptedVotesForCycle.stream()
.collect(Collectors.toMap(DecryptedBallotsWithMerits::getBlindVoteTxId, d -> d.getMerit(daoStateService)));
JsonArray proposalsArray = new JsonArray();
List<EvaluatedProposal> evaluatedProposals = cycleListItem.getResultsOfCycle().getEvaluatedProposals();
evaluatedProposals.sort(Comparator.comparingLong(o -> o.getProposal().getCreationDate()));
@ -973,9 +979,6 @@ public class VoteResultView extends ActivatableView<GridPane, Void> implements D
evaluatedProposals.stream()
.filter(evaluatedProposal -> evaluatedProposal.getProposal().equals(proposal))
.forEach(evaluatedProposal -> {
List<DecryptedBallotsWithMerits> decryptedVotesForCycle = cycleListItem.getResultsOfCycle().getDecryptedVotesForCycle();
// Make sure the votes are sorted so we can easier compare json files from different users
decryptedVotesForCycle.sort(Comparator.comparing(DecryptedBallotsWithMerits::getBlindVoteTxId));
decryptedVotesForCycle.forEach(decryptedBallotsWithMerits -> {
JsonObject voteJson = new JsonObject();
// Domain data of decryptedBallotsWithMerits
@ -984,7 +987,7 @@ public class VoteResultView extends ActivatableView<GridPane, Void> implements D
voteJson.addProperty("voteRevealTxId", decryptedBallotsWithMerits.getVoteRevealTxId());
voteJson.addProperty("stake", decryptedBallotsWithMerits.getStake());
voteJson.addProperty("voteWeight", decryptedBallotsWithMerits.getMerit(daoStateService));
voteJson.addProperty("voteWeight", meritStakeMap.get(decryptedBallotsWithMerits.getBlindVoteTxId()));
String voteResult = decryptedBallotsWithMerits.getVote(evaluatedProp.getProposalTxId())
.map(vote -> vote.isAccepted() ? "Accepted" : "Rejected")
.orElse("Ignored");