Merge pull request #3062 from sqrrm/fix-parsing

Check that proposal is in correct cycle
bisq-network · Aug 7, 2019 · 21514da · 21514da
2 parents 276a506 + 2632928
commit 21514da
Showing 1 changed file with 2 additions and 0 deletions.
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
@@ -559,7 +559,9 @@ private Set<EvaluatedProposal> getEvaluatedProposals(Set<DecryptedBallotsWithMer
         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,