This repository has been archived by the owner on Apr 17, 2019. It is now read-only.
SynchronizationEvent: removed blocks observable #2212
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: Mikhail Boldyrev <[email protected]>
Signed-off-by: Mikhail Boldyrev <[email protected]>
Signed-off-by: Mikhail Boldyrev <[email protected]>
muratovv
approved these changes
Apr 9, 2019
| @@ -70,6 +72,7 @@ namespace iroha { | |||
| block->height(), | |||
| block->hash().hex()); | |||
|
|
|||
| // TODO add height check to predicate | |||
There was a problem hiding this comment.
Pls, leave a task number for the TODO.
irohad/ametsuchi/ledger_state.hpp
Outdated
| : ledger_peers(std::move(peers)) {} | ||
| LedgerState(std::shared_ptr<PeerList> peers, | ||
| shared_model::interface::types::HeightType height) | ||
| : ledger_peers(std::move(peers)), height(height) {} | ||
| LedgerState() = default; |
There was a problem hiding this comment.
I suggest removing default ctor because it doesn't have a case in irohad.
igor-egorov
approved these changes
Apr 9, 2019
Signed-off-by: Mikhail Boldyrev <[email protected]>
lebdron
reviewed
Apr 9, 2019
MBoldyrev
force-pushed
the
feature/sync-event-without-blocks
branch
from
a7e6167 to
b5d51e4
Compare
Signed-off-by: Mikhail Boldyrev <[email protected]>
MBoldyrev
force-pushed
the
feature/sync-event-without-blocks
branch
from
b5d51e4 to
61b925c
Compare
lebdron
reviewed
Apr 11, 2019
| if (ledger_state) { | ||
| new_height = (*ledger_state)->height; | ||
| } else { | ||
| const auto opt_new_height = getTopBlockHeight(); |
There was a problem hiding this comment.
It might be simpler to assume that a missing ledger state is a fatal error at the moment.
| : alternative_outcome, | ||
| higher_than_expected ? consensus::Round{new_height, 0} : msg.round, | ||
| ledger_state ? std::move(*ledger_state) | ||
| : std::unique_ptr<LedgerState>{}}); |
There was a problem hiding this comment.
And to ensure that this pointer is never nullptr.
lebdron
reviewed
Apr 11, 2019
|
|
||
| namespace iroha { | ||
| using PeerList = std::vector<std::shared_ptr<shared_model::interface::Peer>>; | ||
|
|
||
| struct LedgerState { | ||
| std::shared_ptr<PeerList> ledger_peers; | ||
| shared_model::interface::types::HeightType height; |
There was a problem hiding this comment.
Top hash can be added here.
| @@ -79,6 +82,7 @@ namespace iroha { | |||
| block_index_->index(*block); | |||
|
|
|||
| top_hash_ = block->hash(); | |||
| top_height_ = block->height(); | |||
There was a problem hiding this comment.
Top ledger peers can be added here, and used in chainvalidator instead of peerquery.
| return boost::optional<std::unique_ptr<LedgerState>>( | ||
| std::make_unique<LedgerState>( | ||
| std::make_shared<PeerList>(std::move(peers)))); | ||
| std::make_shared<PeerList>(std::move(peers)), |
There was a problem hiding this comment.
Top peers list from mutablestorage can be queried here.
Signed-off-by: Mikhail Boldyrev <[email protected]>
…eature/sync-event-without-blocks Signed-off-by: Mikhail Boldyrev <[email protected]>
…into feature/sync-event-without-blocks Signed-off-by: Mikhail Boldyrev <[email protected]>
Signed-off-by: Mikhail Boldyrev <[email protected]>
MBoldyrev
force-pushed
the
feature/sync-event-without-blocks
branch
from
3aef52d to
463e09e
Compare
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
It is not needed anymore.
Benefits
Performance. Deduplication.
Possible Drawbacks
Less ways to see the blocks.
Usage Examples or Tests [optional]
Alternate Designs [optional]