From 076e3faf95a3d06f69e4c664bb04e45eea08ddff Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 5 Feb 2019 13:41:15 +0100 Subject: [PATCH] Refactor: Move code for adding decryptedBallotsWithMeritsSet to daoStateService --- .../core/dao/governance/voteresult/VoteResultService.java | 4 +--- .../src/main/java/bisq/core/dao/state/DaoStateService.java | 7 +++++++ 2 files changed, 8 insertions(+), 3 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 index f80784f953..5a12e6ed00 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 @@ -176,9 +176,7 @@ public class VoteResultService implements DaoStateListener, DaoSetupService { long startTs = System.currentTimeMillis(); Set decryptedBallotsWithMeritsSet = getDecryptedBallotsWithMeritsSet(chainHeight); - decryptedBallotsWithMeritsSet.stream() - .filter(e -> !daoStateService.getDecryptedBallotsWithMeritsList().contains(e)) - .forEach(daoStateService.getDecryptedBallotsWithMeritsList()::add); + daoStateService.addAllDecryptedBallotsWithMeritsList(decryptedBallotsWithMeritsSet); if (!decryptedBallotsWithMeritsSet.isEmpty()) { // From the decryptedBallotsWithMerits we create a map with the hash of the blind vote list as key and the diff --git a/core/src/main/java/bisq/core/dao/state/DaoStateService.java b/core/src/main/java/bisq/core/dao/state/DaoStateService.java index 76122a7afe..1f29d53712 100644 --- a/core/src/main/java/bisq/core/dao/state/DaoStateService.java +++ b/core/src/main/java/bisq/core/dao/state/DaoStateService.java @@ -912,6 +912,13 @@ public class DaoStateService implements DaoSetupService { return daoState.getDecryptedBallotsWithMeritsList(); } + public void addAllDecryptedBallotsWithMeritsList(Set decryptedBallotsWithMeritsSet) { + decryptedBallotsWithMeritsSet.stream() + .filter(e -> !daoState.getDecryptedBallotsWithMeritsList().contains(e)) + .forEach(daoState.getDecryptedBallotsWithMeritsList()::add); + + } + /////////////////////////////////////////////////////////////////////////////////////////// // Asset listing fee