Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[txnId_Fix] Add txn_id while metadata appending (if exist) #724

Merged
merged 3 commits into from
Jun 5, 2018

Conversation

lampkin-diet
Copy link

Signed-off-by: Andrew Nikitin andrew.nikitin@dsr-corporation.com

Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
append_txn_metadata(txn,
seq_no=seq_no,
txn_time=txn_time,
txn_id=t.get(TXN_ID, None))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TXN_ID needs to be popped from the txn's data, doens't it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, txnId is placed on the top level of txn

Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
txn = do_req_to_txn(req_data=t,
req_op=t)
append_txn_metadata(txn, seq_no=seq_no, txn_time=txn_time)
append_txn_metadata(txn,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a test (extend test_new_txn_format)

Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
@ashcherbakov ashcherbakov merged commit b72074b into hyperledger:master Jun 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants