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

Serious refactoring + improvements + adding new examples for Iroha 1 #107

Merged
merged 13 commits into from
Aug 8, 2022
Merged

Serious refactoring + improvements + adding new examples for Iroha 1 #107

merged 13 commits into from
Aug 8, 2022

Conversation

baziorek
Copy link

@baziorek baziorek commented Jul 12, 2022 •
edited
Loading

I've made some refactoring similar to #103. Changes:

  1. Added new examples:
    1. tx-ordering.py - example how to use not default ordering in returning from GetAccountTransactions
    2. add-syncing-peer.py - example how to add new syncing node
  2. Refactoring of other examples:
    1. Added docstring for each example file
    2. Change old way of formatting strings into fstrings
    3. Better error handling - not only printing when something wrong but exceptions when error occurs + detecting GRPC connection error.
    4. Improved function wrapper
    5. Correcting functions - less hardcoding, functions more configurable
    6. if __name__ == '__main__':
    7. style more PEP8 compatible
    8. Renamed examples to make names more consistent
  3. updated README file

@baziorek
Update README
77419e2 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Update README
9259344 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Refactoring in tls-example.py
e2df4d8 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
A little refactoring of batch-example.py
b1286f5 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Small refactoring of blocks-query.py
8a1e2af 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Small refactoring of infinite-blocks-stream.py
c937b62 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Added sample how to use ordering of result transactions
7a7c78b 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Refacroting in query_transactions.py
952e179 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Renamed file with convention used in other files
fb2502b 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Added examples in comments
647d2d6 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
Some refactoring in examples + added docstring in each file
5f11a06 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek
chmod +x
3e973f4 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@baziorek baziorek requested a review from iceseer July 12, 2022 20:09
@baziorek baziorek self-assigned this Jul 12, 2022
@baziorek
Updated iroha version from 1.4 -> 1.5
4090c4d 
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@6r1d
Copy link
Contributor

6r1d commented Jul 27, 2022

Looks good to me, although I am not yet allowed to review the code.

@baziorek baziorek merged commit bfd9bf2 into hyperledger-iroha:develop Aug 8, 2022
@baziorek baziorek deleted the examples_refactoring branch August 8, 2022 07:53
This was referenced Aug 8, 2022
Closed
Closed
Merged
baziorek added a commit to baziorek/iroha-python that referenced this pull request Aug 8, 2022
@baziorek
Serious refactoring + improvements + adding new examples for Iroha 1 (h…
65a6d23 
…yperledger-iroha#107)

* Update README
* Refactoring in tls-example.py
* A little refactoring of batch-example.py
* Small refactoring of blocks-query.py
* Small refactoring of infinite-blocks-stream.py
* Added sample how to use ordering of result transactions
* Refacroting in query_transactions.py
* Renamed file with convention used in other files
* Added examples in comments
* Some refactoring in examples + added docstring in each file
* chmod +x
* Updated iroha version from 1.4 -> 1.5

Signed-off-by: G.Bazior <bazior@agh.edu.pl>
baziorek added a commit that referenced this pull request Aug 22, 2022
@baziorek @Pawlak00
@stepanLav @turbopape @Stayer
Cherry-pick changes from develop -> main (#122)
0b2d615 
* Extending TxPaginationMeta in queries (#77)

* quries extended
* example added
* docs comment added
* schema changed
* formatting fixed
* ordering added
* edge case fix, now 0 passed as height or timestamp is passing
* PaginationMeta in GetPendingTransactions
* examples/query_transactions.py

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Update proto files and generated python files to support Iroha 1.4 (#96)

* Update proto files with script `download-schema.py`

Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>

* Generated python files from protobuf files with script `compile-proto.py`

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

Co-authored-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Corrected merge - rerun scripts: download-schema.py and compile-proto.py

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Tab -> spaces

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Add ability to provide custom TLS cert (#63)

Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Add ordering sequence to params in query (#73)

* Add ordering sequence to params

Makes possible to add ordering sequence to Query. Fixes #72

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* Add :param ordering_sequence:

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* Fix wrong example for :param ordering_sequence:

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* fix wrong ordering message construction in query

After more documentation I got to the way to construct to ordering object

Signed-off-by: Rafik Naccache <rafik@fekr.tech>

* remove redundant OR clause to manage ordering_sequence

Signed-off-by: Rafik Naccache <rafik@fekr.tech>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Extending TxPaginationMeta in queries (#77)

* quries extended
* example added
* docs comment added
* schema changed
* formatting fixed
* ordering added
* edge case fix, now 0 passed as height or timestamp is passing
* PaginationMeta in GetPendingTransactions
* examples/query_transactions.py

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Added missing changes from Pawlak00@b6d7f42 corrected in #77

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Examples refactor + added example of MST developed by Leo (#103)

* Refactoring of example tx-example.py

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Added sample of MST transactions. The code was originally developed by Leo: https://github.com/iptelephony/jubilant-engine but he agreed to add his code to examples

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Generated protobuf files with protobuf 3.12.4 on Ubuntu 21.04 (#104)

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Serious refactoring + improvements + adding new examples for Iroha 1 (#107)

* Update README
* Refactoring in tls-example.py
* A little refactoring of batch-example.py
* Small refactoring of blocks-query.py
* Small refactoring of infinite-blocks-stream.py
* Added sample how to use ordering of result transactions
* Refacroting in query_transactions.py
* Renamed file with convention used in other files
* Added examples in comments
* Some refactoring in examples + added docstring in each file
* chmod +x
* Updated iroha version from 1.4 -> 1.5

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Add autorestart to iroha

Signed-off-by: Alexey Rodionov <rodionov12@gmail.com>

* Cherry-pick fix

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Generated python files from protobuf on Ubuntu:20.04

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Dependencies fix

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Added space in logging after review

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

* Made import in code more readable after review

Signed-off-by: G.Bazior <bazior@agh.edu.pl>

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
Signed-off-by: Stepan Lavrentev <lawrentievsv@gmail.com>
Signed-off-by: Rafik Naccache <rafik@fekr.tech>
Signed-off-by: Alexey Rodionov <rodionov12@gmail.com>
Co-authored-by: Piotr Pawłowski <68233055+Pawlak00@users.noreply.github.com>
Co-authored-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Co-authored-by: Stepan Lavrentev <40560660+stepanLav@users.noreply.github.com>
Co-authored-by: Rafik NACCACHE <rafik@fekr.tech>
Co-authored-by: Alexey Rodionov <rodionov12@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iceseer iceseer iceseer approved these changes

Assignees

@baziorek baziorek

Labels
enhancement iroha1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@baziorek @6r1d @iceseer