[INDY-1385] Fix last_prepared_sertificate computing #786
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
added 5 commits
June 27, 2018 09:38
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
ashcherbakov
reviewed
Jul 3, 2018
| sdk_wallet_steward): | ||
| A, B, C, D = txnPoolNodeSet | ||
| for n in [A, B, C]: | ||
| # Do not send prepares and prepares for Delta node |
There was a problem hiding this comment.
prepares and pre-prepares
| # Do not send prepares and prepares for Delta node | ||
| D.nodeIbStasher.delay(pDelay(1000, 0, sender_filter=n.name)) | ||
| D.nodeIbStasher.delay(ppDelay(1000, 0, sender_filter=n.name)) | ||
| sdk_send_random_and_check(looper, |
There was a problem hiding this comment.
Why need to send 5 requests and override tconf.Max3PCBatchSize?
| for n in [A, B, C]: | ||
| # Do not send prepares to Delta node | ||
| D.nodeIbStasher.delay(pDelay(1000, 0, sender_filter=n.name)) | ||
| sdk_send_random_and_check(looper, |
There was a problem hiding this comment.
Why need to send 5 requests and override tconf.Max3PCBatchSize?
| assert D.master_replica.prepares | ||
| # There is no quorum for all prepares | ||
| for key in D.master_replica.prepares.keys(): | ||
| assert D.master_replica.prepares.hasQuorum(ThreePhaseKey(*key), quorum) == False |
| yield tconf | ||
| tconf.Max3PCBatchSize = old_m | ||
|
|
||
|
|
There was a problem hiding this comment.
Is it the same tests as above?
| for key in self.prepares.keys(): | ||
| if self.prepares.hasQuorum(ThreePhaseKey(*key), quorum): | ||
| keys.append(key) | ||
| return max_3PC_key(keys) if keys else None |
There was a problem hiding this comment.
Please add a test that we get the maximum value as last prepared
| @@ -0,0 +1,31 @@ | |||
| import pytest | |||
|
|
|||
There was a problem hiding this comment.
It may be sufficient to have just unit tests here:
See test/replica/test_api.py
added 2 commits
July 3, 2018 11:39
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
ashcherbakov
reviewed
Jul 3, 2018
| @@ -4,6 +4,8 @@ | |||
| from plenum.test.helper import sdk_send_random_and_check | |||
|
|
|||
|
|
|||
| txnCount = 5 | |||
|
|
|||
| @pytest.fixture(scope="module") | |||
| def tconf(tconf): | |||
| old_m = tconf.Max3PCBatchSize | |||
There was a problem hiding this comment.
Can we make this test unit as well?
| @@ -5,6 +5,8 @@ | |||
| from plenum.test.helper import sdk_send_random_and_check | |||
|
|
|||
|
|
|||
| txnCount = 5 | |||
There was a problem hiding this comment.
Can we make this test unit as well?
plenum/test/replica/test_api.py
Outdated
| txnRootHash='Hhyw96wihpeG9whMNuyPhUcTV76HiHcYJrepDsjuarYJ', | ||
| viewNo=0)) | ||
| replica.prepares[(0, 2)] = ThreePhaseVotes(voters=('Delta:0',), | ||
| msg=Prepare(digest='12a05a12df55d4595807ec6edaf3bc36766feb4ab5479a5b45434a4288c9871b', |
There was a problem hiding this comment.
Please use a helper method to create a Prepare
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
|
test this please |
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
ashcherbakov
approved these changes
Jul 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For now, last prepared serticate is max 3PC key of quorumed prepares.