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.

Sign up for GitHub

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

Jump to bottom

Txn format refactoring #683

Merged
merged 58 commits into from
May 29, 2018
Merged

Txn format refactoring #683

merged 58 commits into from
May 29, 2018

Conversation

ashcherbakov
Copy link
Contributor

@ashcherbakov ashcherbakov commented May 18, 2018 •
edited

  • re-factored txns to the new format separating data and metadata (request format is not changed)
  • use utility methods to access txn fields
  • use utility methods to create txns

ashcherbakov and others added 30 commits April 25, 2018 10:34
@ashcherbakov
transform txns to the new format
90f3872 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
add req_to_txn
bcc422c 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
improved tests
fc4acd9 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
use util methods to access txn fields
28a9b8d 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
245f2a2 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
Merge branches 'master' and 'txn-refactoring' of github.com:hyperledg…
8fc9679 
…er/indy-plenum into txn-refactoring

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>

# Conflicts:
#	plenum/server/domain_req_handler.py
#	plenum/server/req_handler.py
#	plenum/test/bls/test_bls_key_registry_pool_manager.py
#	plenum/test/common/test_parse_ledger.py
#	plenum/test/node_catchup/test_req_id_key_error.py
#	plenum/test/plugin/demo_plugin/auction_req_handler.py
#	plenum/test/pool_transactions/test_start_many_nodes.py
#	plenum/test/pool_transactions/test_txn_pool_manager.py
#	plenum/test/test_dirty_read.py
#	plenum/test/test_request_executed_once_and_without_failing_behind.py
#	plenum/test/validator_info/test_validator_info.py
@ashcherbakov
fix tests
f8e7f30 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fixes for indy-node
3591417 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
Merge branches 'master' and 'txn-refactoring' of github.com:hyperledg…
3875556 
…er/indy-plenum into txn-refactoring
@ashcherbakov
add version to txns
8764dc1 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
do not include empty optional fields
0a96cb6 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
f2b3ab6 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
70b9b97 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
78e81a2 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
4bab1c7 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
6b54d36 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
9783a4f 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix tests
917346c 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
Merge branches 'master' and 'txn-refactoring' of github.com:hyperledg…
875d62a 
…er/indy-plenum into txn-refactoring

Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>

# Conflicts:
#	plenum/common/script_helper.py
@ashcherbakov
fix flake8
e99a839 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix flake8
e6708bc 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fix flake8
a8badeb 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
bump sdk and crypto
c17d8df 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
fixes for tests
9dff6d5 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
INDY-1319: fix test_request_executed_once_and_without_failing_behind.
bdae30f 
Signed-off-by: Sergey Shilov <sergey.shilov@dsr-company.com>
@ashcherbakov
Merge pull request #687 from sergey-shilov/txn-refactoring
fde1255 
INDY-1319: fix test_request_executed_once_and_without_failing_behind.
@ashcherbakov
fix seq_no in appended txns in ledger and added tests
6ef7d53 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
Merge remote-tracking branch 'origin/txn-refactoring' into txn-refact…
721a281 
…oring
@dsurnin
Merge remote-tracking branch 'origin/master' into txn-refactoring
e80ebbf
Fix tests.
b0a19a7 
Signed-off-by: Sergey Shilov <sergey.shilov@dsr-company.com>
Sergey Shilov and others added 13 commits May 23, 2018 10:50
INDY-1319: return get() method back to the ledger implementation.
3bdd723 
Signed-off-by: Sergey Shilov <sergey.shilov@dsr-company.com>
@dsurnin
Fix flake errors
5ac53a6 
Signed-off-by: dsurnin <dmitry.surnin@dsr-corporation.com>
@ashcherbakov
Merge pull request #696 from sergey-shilov/txn-refactoring
c00b38d 
INDY-1319: return get() method back to the ledger implementation.
@ashcherbakov
Merge pull request #697 from dsurnin/txn-refactoring
236fe77 
Fix flake errors
@ashcherbakov
fix sorting of arrays in msg pack serialization
d6d4941 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
@ashcherbakov
Merge remote-tracking branch 'origin/txn-refactoring' into txn-refact…
d23698c 
…oring
@ashcherbakov
unskip sdk_pool_refresh
37d7ebe 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
INDY-1319: move calculation of seqNo's from ledger's appendTxns().
3dc844d 
Signed-off-by: Sergey Shilov <sergey.shilov@dsr-company.com>
Fix ledger tests.
297109c 
Signed-off-by: Sergey Shilov <sergey.shilov@dsr-company.com>
Remove adding of txn time from reqToTxn() function.
44dba51 
Signed-off-by: Sergey Shilov <sergey.shilov@dsr-company.com>
@ashcherbakov
Merge pull request #702 from sergey-shilov/txn-refactoring
b245d08 
INDY-1319: move calculation of seqNo's from ledger's appendTxns().
INDY-1319: remove apply() method from ConfigReqHandler class.
c3515ea 
Signed-off-by: Sergey Shilov <sergey.shilov@dsr-company.com>
@ashcherbakov
Merge pull request #706 from sergey-shilov/txn-refactoring
4dfe1a9 
INDY-1319: return apply() method to back TestConfigReqHandler class.
@sergey-shilov
Copy link
Contributor

Test this please.

@ashcherbakov
Copy link
Contributor Author

test this please

1 similar comment
@ashcherbakov
Copy link
Contributor Author

test this please

Andrew Nikitin and others added 3 commits May 28, 2018 15:01
[INDY-1319] txn-refactoring for update node txn through old cli
ad9e137 
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
@ashcherbakov
Merge pull request #709 from anikitinDSR/txn-refactoring
3d1a8ff 
[INDY-1319] txn-refactoring for update node txn through old cli
@ashcherbakov
fix log level in tests
2bfa390 
Signed-off-by: ashcherbakov <alexander.sherbakov@dsr-company.com>
lampkin-diet
lampkin-diet reviewed May 28, 2018
View reviewed changes
plenum/client/pool_manager.py Outdated
self.stackHaChanged(txn_data, remoteName, self)
if VERKEY in txn_data:
self.stackKeysChanged(txn_data, remoteName, self)
if SERVICES in txn_data[DATA]:
self.nodeServicesChanged(txn)
Copy link

Choose a reason for hiding this comment

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

Should we replace txn with txn_data?
And in _update definition too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think yes

Andrew Nikitin and others added 4 commits May 28, 2018 16:44
[INDY-1319] Replace txn with txn_data
332dc2e 
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
@ashcherbakov
Merge pull request #710 from anikitinDSR/txn-refactoring
ec37c2c 
[INDY-1319] Replace txn with txn_data
[INDY-1319] fix flake8
96436bc 
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
@ashcherbakov
Merge pull request #711 from anikitinDSR/txn-refactoring
5104817 
[INDY-1319] fix flake8
@ashcherbakov
Copy link
Contributor Author

test this please

1 similar comment
@ashcherbakov
Copy link
Contributor Author

test this please

@ashcherbakov ashcherbakov merged commit 3d65f65 into master May 29, 2018
@ashcherbakov ashcherbakov deleted the txn-refactoring branch May 31, 2018 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vimmerru vimmerru vimmerru approved these changes

@lampkin-diet lampkin-diet lampkin-diet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ashcherbakov @sergey-shilov @vimmerru @lampkin-diet @dsurnin