From fe3af46198cbfbdd26291dfca959d5e884440e37 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 3 Feb 2019 19:07:49 +0100 Subject: [PATCH 01/11] Add throws VoteResultException.ConsensusException --- .../core/dao/governance/voteresult/VoteResultConsensus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultConsensus.java b/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultConsensus.java index 1008ebcf94c..ca734a03814 100644 --- a/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultConsensus.java +++ b/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultConsensus.java @@ -68,7 +68,7 @@ public static VoteWithProposalTxIdList decryptVotes(byte[] encryptedVotes, Secre // hex encoded hashOfProposalList for comparision @Nullable public static byte[] getMajorityHash(List hashWithStakeList) - throws VoteResultException.ValidationException { + throws VoteResultException.ValidationException, VoteResultException.ConsensusException { try { checkArgument(!hashWithStakeList.isEmpty(), "hashWithStakeList must not be empty"); hashWithStakeList.sort(Comparator.comparingLong(VoteResultService.HashWithStake::getStake).reversed() From 32ebb07c48932b841d7b97d49a3b80276eefb5cf Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:49:38 +0100 Subject: [PATCH 02/11] Update common/src/main/java/bisq/common/util/PermutationUtil.java Co-Authored-By: ManfredKarrer --- common/src/main/java/bisq/common/util/PermutationUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/bisq/common/util/PermutationUtil.java b/common/src/main/java/bisq/common/util/PermutationUtil.java index c42df229fe4..dbcab390a16 100644 --- a/common/src/main/java/bisq/common/util/PermutationUtil.java +++ b/common/src/main/java/bisq/common/util/PermutationUtil.java @@ -60,7 +60,7 @@ public static List getPartialList(List list, List indicesToRe * With 20 items we reach about 1 million iterations and it takes about 0.5 sec. * To avoid performance issues we added the maxIterations parameter to stop once the number of iterations has * reached the maxIterations and return in such a case the list of permutations we have been able to create. - * Depending on the type of object which is stored in the list the memory usage should to be considered as well for + * Depending on the type of object which is stored in the list the memory usage should be considered as well for * choosing the right maxIterations value. * * @param list List from which we create permutations From 4ae98b5709f4716446592b12533ee1fb8c93ce07 Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:51:20 +0100 Subject: [PATCH 03/11] Update common/src/test/java/bisq/common/util/PermutationTest.java Co-Authored-By: ManfredKarrer --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index d8bd14b238f..6ecc5507752 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -51,7 +51,7 @@ public void testGetPartialList() { assertTrue(expected.toString().equals(result.toString())); // remove first - indicesToRemove = indicesToRemove = Collections.singletonList(0); + indicesToRemove = Collections.singletonList(0); expected = new ArrayList<>(list); expected.remove(0); result = PermutationUtil.getPartialList(list, indicesToRemove); From e496ddcc9098f99eb674f0ee23b2fdc14d50603f Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:51:35 +0100 Subject: [PATCH 04/11] Update common/src/test/java/bisq/common/util/PermutationTest.java Co-Authored-By: ManfredKarrer --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index 6ecc5507752..f2ea9ae6272 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -71,7 +71,7 @@ public void testGetPartialList() { assertTrue(expected.toString().equals(result.toString())); // wrong sorting of indices - indicesToRemove = indicesToRemove = Arrays.asList(4, 0, 1); + indicesToRemove = Arrays.asList(4, 0, 1); expected = expected = new ArrayList<>(Arrays.asList(blindVote2, blindVote3, blindVote5)); result = PermutationUtil.getPartialList(list, indicesToRemove); assertTrue(expected.toString().equals(result.toString())); From 204e505fed7e39ee182ef6a86b5a8ca308c8821e Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:51:47 +0100 Subject: [PATCH 05/11] Update common/src/test/java/bisq/common/util/PermutationTest.java Co-Authored-By: ManfredKarrer --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index f2ea9ae6272..8c4a7d1efa9 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -78,7 +78,7 @@ public void testGetPartialList() { // wrong sorting of indices indicesToRemove = indicesToRemove = Arrays.asList(0, 0); - expected = expected = new ArrayList<>(Arrays.asList(blindVote1, blindVote2, blindVote3, blindVote4, blindVote5)); + expected = new ArrayList<>(Arrays.asList(blindVote1, blindVote2, blindVote3, blindVote4, blindVote5)); result = PermutationUtil.getPartialList(list, indicesToRemove); assertTrue(expected.toString().equals(result.toString())); From aff5a551bc4eae9c677e0031c823f43388f25a18 Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:51:54 +0100 Subject: [PATCH 06/11] Update common/src/test/java/bisq/common/util/PermutationTest.java Co-Authored-By: ManfredKarrer --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index 8c4a7d1efa9..bd1a672f59b 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -83,7 +83,7 @@ public void testGetPartialList() { assertTrue(expected.toString().equals(result.toString())); // don't remove as invalid index - indicesToRemove = indicesToRemove = Collections.singletonList(9); + indicesToRemove = Collections.singletonList(9); expected = new ArrayList<>(list); result = PermutationUtil.getPartialList(list, indicesToRemove); assertTrue(expected.toString().equals(result.toString())); From 46dfaf280f2c1d1f5c132e5c1af09f9d528cb1af Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:52:00 +0100 Subject: [PATCH 07/11] Update common/src/test/java/bisq/common/util/PermutationTest.java Co-Authored-By: ManfredKarrer --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index bd1a672f59b..b47e5569832 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -89,7 +89,7 @@ public void testGetPartialList() { assertTrue(expected.toString().equals(result.toString())); // don't remove as invalid index - indicesToRemove = indicesToRemove = Collections.singletonList(-2); + indicesToRemove = Collections.singletonList(-2); expected = new ArrayList<>(list); result = PermutationUtil.getPartialList(list, indicesToRemove); assertTrue(expected.toString().equals(result.toString())); From ada67fa8e710754b8f9dc65d37b7cc40611ed44b Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:52:09 +0100 Subject: [PATCH 08/11] Update common/src/test/java/bisq/common/util/PermutationTest.java Co-Authored-By: ManfredKarrer --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index b47e5569832..a80f2573fe6 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -77,7 +77,7 @@ public void testGetPartialList() { assertTrue(expected.toString().equals(result.toString())); // wrong sorting of indices - indicesToRemove = indicesToRemove = Arrays.asList(0, 0); + indicesToRemove = Arrays.asList(0, 0); expected = new ArrayList<>(Arrays.asList(blindVote1, blindVote2, blindVote3, blindVote4, blindVote5)); result = PermutationUtil.getPartialList(list, indicesToRemove); assertTrue(expected.toString().equals(result.toString())); From 5f0e64f17308952c47aae255d9b576289dce9e1e Mon Sep 17 00:00:00 2001 From: sqrrm Date: Sun, 3 Feb 2019 20:52:18 +0100 Subject: [PATCH 09/11] Update common/src/test/java/bisq/common/util/PermutationTest.java Co-Authored-By: ManfredKarrer --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index a80f2573fe6..a2aacb7a587 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -65,7 +65,7 @@ public void testGetPartialList() { assertTrue(expected.toString().equals(result.toString())); // remove all - indicesToRemove = indicesToRemove = Arrays.asList(0, 1, 2, 3, 4, 5); + indicesToRemove = Arrays.asList(0, 1, 2, 3, 4, 5); expected = new ArrayList<>(); result = PermutationUtil.getPartialList(list, indicesToRemove); assertTrue(expected.toString().equals(result.toString())); From 42e37d7a07768ea35c9265ef039f1e3bac2da933 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 3 Feb 2019 21:03:35 +0100 Subject: [PATCH 10/11] Cleanup --- common/src/test/java/bisq/common/util/PermutationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/bisq/common/util/PermutationTest.java index a2aacb7a587..149cf9c971a 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/bisq/common/util/PermutationTest.java @@ -58,7 +58,7 @@ public void testGetPartialList() { assertTrue(expected.toString().equals(result.toString())); // remove last - indicesToRemove = indicesToRemove = Collections.singletonList(5); + indicesToRemove = Collections.singletonList(5); expected = new ArrayList<>(list); expected.remove(5); result = PermutationUtil.getPartialList(list, indicesToRemove); From fcc0dcf91f370d2b2e5a47b27096a5b09f310378 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 3 Feb 2019 21:05:00 +0100 Subject: [PATCH 11/11] Improve logs --- .../governance/voteresult/MissingDataRequestService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java b/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java index cb922a2bff2..24d38f03d2a 100644 --- a/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java +++ b/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java @@ -78,6 +78,9 @@ public void sendRepublishRequest() { } public void reRepublishAllGovernanceData() { + log.warn("We received a RepublishGovernanceDataRequest and re-published all proposalPayloads and " + + "blindVotePayloads to the P2P network."); + ObservableList proposalPayloads = proposalService.getProposalPayloads(); proposalPayloads.forEach(proposalPayload -> { // We want a random delay between 0.1 and 30 sec. depending on the number of items @@ -86,7 +89,7 @@ public void reRepublishAllGovernanceData() { boolean success = p2PService.addPersistableNetworkPayload(proposalPayload, true); String txId = proposalPayload.getProposal().getTxId(); if (success) { - log.warn("We received a RepublishGovernanceDataRequest and re-published a proposalPayload to " + + log.debug("We received a RepublishGovernanceDataRequest and re-published a proposalPayload to " + "the P2P network as append only data. proposalTxId={}", txId); } else { log.error("Adding of proposalPayload to P2P network failed. proposalTxId={}", txId); @@ -103,7 +106,7 @@ public void reRepublishAllGovernanceData() { boolean success = p2PService.addPersistableNetworkPayload(blindVotePayload, true); String txId = blindVotePayload.getBlindVote().getTxId(); if (success) { - log.warn("We received a RepublishGovernanceDataRequest and re-published a blindVotePayload to " + + log.debug("We received a RepublishGovernanceDataRequest and re-published a blindVotePayload to " + "the P2P network as append only data. blindVoteTxId={}", txId); } else { log.error("Adding of blindVotePayload to P2P network failed. blindVoteTxId={}", txId);