ST-541 Fix creation of audit ledger transactions #1154
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
added 2 commits
April 8, 2019 17:29
…multiple ledgers in one batch Signed-off-by: Nikita Khateev <nikita.khateev@dsr-corporation.com>
Signed-off-by: Nikita Khateev <nikita.khateev@dsr-corporation.com>
|
Can one of the admins verify this patch? |
|
Could one of the committers please verify this patch? |
ashcherbakov
reviewed
Apr 8, 2019
| last_audit_txn_data = get_payload_data(last_audit_txn) if last_audit_txn is not None else None | ||
|
|
||
| # 1. ledger is changed in this batch => root_hash | ||
| if lid == target_ledger_id: | ||
| txn[AUDIT_TXN_LEDGER_ROOT][lid] = Ledger.hashToStr(three_pc_batch.txn_root) | ||
| if ledger.uncommittedTxns: |
There was a problem hiding this comment.
We may have multiple uncommitted txns for the same ledger in fly, so that a check if ledger.uncommittedTxns doesn't man that a ledger was changed in this batch.
Signed-off-by: Nikita Khateev <nikita.khateev@dsr-corporation.com>
ashcherbakov
reviewed
Apr 8, 2019
| @@ -98,7 +98,7 @@ def _create_audit_txn_data(self, three_pc_batch, last_audit_txn): | |||
|
|
|||
| # 3. ledger root (either root_hash or seq_no to last changed) | |||
| # TODO: support setting for multiple ledgers | |||
| self.__fill_ledger_root_hash(txn, three_pc_batch, lid, last_audit_txn) | |||
| self.__fill_ledger_root_hash(txn, lid, ledger, last_audit_txn) | |||
|
|
|||
| # 4. state root hash | |||
| txn[AUDIT_TXN_STATE_ROOT][three_pc_batch.ledger_id] = Ledger.hashToStr(three_pc_batch.state_root) | |||
There was a problem hiding this comment.
We need to update AUDIT_TXN_STATE_ROOT for all changed ledgers as well.
|
|
||
| # 2. This ledger is never audited, so do not add the key | ||
| # 1.1. Rare case -- we have previous audit txns but don't have this ledger i.e. new plugins |
There was a problem hiding this comment.
Please add unit tests for each of this cases
There was a problem hiding this comment.
Enhanced old unit test and added a new one for the rare case
Signed-off-by: Nikita Khateev <nikita.khateev@dsr-corporation.com>
|
(ci) test this please |
ashcherbakov
previously approved these changes
Apr 9, 2019
Signed-off-by: Nikita Khateev <nikita.khateev@dsr-corporation.com>
|
(ci) test this please |
Signed-off-by: Nikita Khateev <nikita.khateev@dsr-corporation.com>
ashcherbakov
approved these changes
Apr 10, 2019
| txn_data = audit_batch_handler._create_audit_txn_data(batch, audit_batch_handler.ledger.get_last_txn()) | ||
|
|
||
| # Checking first batch created | ||
| assert txn_data[AUDIT_TXN_LEDGER_ROOT][1] == domain_root_hash_2 |
There was a problem hiding this comment.
It would be great to use check_audit_txn in these tests.
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.
It now works for multiple ledgers in one batch