This repository has been archived by the owner on Apr 17, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 296
MST: fixed expired incoming state logic #2211
Open
MBoldyrev
wants to merge
5
commits into
develop
Choose a base branch
from
fix/mst-expired-incoming-state
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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]>
MBoldyrev
added
needs-review
pr awaits review from maintainers
mst
multisignature transactions
labels
Apr 4, 2019
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); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is could be an explanation of why we throw batches from new_state
log_->info("Applying new state"); | ||
auto current_time = time_provider_->getCurrentTime(); | ||
|
||
new_state.eraseExpired(current_time); | ||
auto state_update = storage_->apply(from, new_state); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems, there is missing expiredBatchesNotify
invocation.
// ---------------------------------| then |---------------------------------- | ||
EXPECT_FALSE(storage->batchInStorage(expired_batch)); | ||
check(observers); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, there could be another test which checks that expired transactions from new_state will be not propagated by the expired notifier.
Signed-off-by: Mikhail Boldyrev <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
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.receivedOutdatedState
test.Alternate Designs [optional]