This repository has been archived by the owner on Apr 17, 2019. It is now read-only.
Fix consensus VoteOther case #1834
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
nickaleks
previously requested changes
Nov 6, 2018
| @@ -35,15 +36,19 @@ namespace iroha { | |||
| * apply the missing blocks | |||
| */ | |||
| SynchronizationEvent downloadMissingBlocks( | |||
| std::shared_ptr<shared_model::interface::Block> commit_message, | |||
| const shared_model::interface::types::PublicKeyCollectionType | |||
There was a problem hiding this comment.
Maybe pass VoteOther to avoid specifying all parameters in functions?
| void init() { | ||
| gate = std::make_shared<YacGateImpl>(std::move(hash_gate), | ||
| std::move(peer_orderer), | ||
| EXPECT_CALL(*block_creator, on_block()) |
There was a problem hiding this comment.
Maybe use ON_CALL so that we do not set any unnecessary invariants for tests?
| // verify that yac gate emit expected block | ||
| auto gate_wrapper = make_test_subscriber<CallExact>(gate->onOutcome(), 1); | ||
| gate_wrapper.subscribe([actual_hash, actual_pubkey](auto outcome) { | ||
| auto concete_outcome = boost::get<iroha::consensus::VoteOther>(outcome); |
l4l
approved these changes
Nov 6, 2018
|
|
||
| hash_gate = make_unique<MockHashGate>(); | ||
| peer_orderer = make_unique<MockYacPeerOrderer>(); | ||
| auto hash_gate_ptr = make_unique<MockHashGate>(); |
There was a problem hiding this comment.
using namespace std
😱 (not a pr issue)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
nickaleks
approved these changes
Nov 9, 2018
| @@ -119,8 +119,19 @@ namespace iroha { | |||
| PairValid{block, current_hash_.vote_round}); | |||
| } | |||
| log_->info("Voted for another block, waiting for sync"); | |||
| auto public_keys = std::accumulate( | |||
There was a problem hiding this comment.
maybe use transform instead?
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the Change
The information in VoteOther struct was not enough to handle block loading, so it is replaced with
Benefits
Can synchronize in case different block was committed
Possible Drawbacks
None?