From a0bba5d716ae298c4bc98ccd10e92d3eadbbdd23 Mon Sep 17 00:00:00 2001 From: sqrrm Date: Wed, 7 Aug 2019 20:12:20 +0200 Subject: [PATCH] Check that proposal is in correct cycle --- .../bisq/core/dao/governance/voteresult/VoteResultService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java b/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java index 7d50fb9092..fa464ff8a4 100644 --- a/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java +++ b/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java @@ -559,7 +559,9 @@ public class VoteResultService implements DaoStateListener, DaoSetupService { evaluatedProposals.forEach(evaluatedProposal -> evaluatedProposalsByTxIdMap.put(evaluatedProposal.getProposalTxId(), evaluatedProposal)); // Proposals which did not get any vote need to be set as failed. + // TODO We should not use proposalListPresentation here proposalListPresentation.getActiveOrMyUnconfirmedProposals().stream() + .filter(proposal -> periodService.isTxInCorrectCycle(proposal.getTxId(), chainHeight)) .filter(proposal -> !evaluatedProposalsByTxIdMap.containsKey(proposal.getTxId())) .forEach(proposal -> { ProposalVoteResult proposalVoteResult = new ProposalVoteResult(proposal, 0,