This repository was archived by the owner on Apr 17, 2019. It is now read-only.
MST: fixed expired incoming state logic - #2211
Open
MBoldyrev wants to merge 5 commits into
Open
Conversation
Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
MBoldyrev
added
needs-review
igor-egorov
approved these changes
Apr 4, 2019
muratovv
suggested changes
Apr 8, 2019
| log_->info("Applying new state"); | ||
| auto current_time = time_provider_->getCurrentTime(); | ||
|
|
||
| new_state.eraseExpired(current_time); |
Contributor
There was a problem hiding this comment.
There is could be an explanation of why we throw batches from new_state
|
|
||
| new_state.eraseExpired(current_time); | ||
| auto state_update = storage_->apply(from, new_state); | ||
|
|
Contributor
There was a problem hiding this comment.
Seems, there is missing expiredBatchesNotify invocation.
| // ---------------------------------| then |---------------------------------- | ||
| EXPECT_FALSE(storage->batchInStorage(expired_batch)); | ||
| check(observers); | ||
| } |
Contributor
There was a problem hiding this comment.
Also, there could be another test which checks that expired transactions from new_state will be not propagated by the expired notifier.
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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
This change removes a very strange line the rationale behind which was not found:
https://github.com/hyperledger/iroha/blob/df5272c243db9eadaf737fa510af1e5566c823d0/irohad/multi_sig_transactions/impl/mst_processor_impl.cpp#L110
...and adds early removal of expired batches from incoming
MstState. Also move semantics get used.Benefits
see above
Possible Drawbacks
There remains a possibility that the removed line of code was helpful...
Usage Examples or Tests [optional]
Regarding the removed line, it broke no tests when it was commented out.
Regarding the outdated batches, please see mst_processor_test
MstProcessorTest.receivedOutdatedStatetest.Alternate Designs [optional]