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

Extending TxPaginationMeta in queries #77

Merged
merged 21 commits into from
Sep 10, 2021
Merged

Extending TxPaginationMeta in queries #77

merged 21 commits into from
Sep 10, 2021

Conversation

Pawlak00
Copy link

@Pawlak00 Pawlak00 commented Jul 22, 2021 •
edited
Loading

Using extended TxPaginationMeta in iroha-python library.

@baziorek
Copy link

The issue depends on features from hyperledger-iroha/iroha#1092

@Pawlak00 I suggest to rebase with destination branch

@Pawlak00 Pawlak00 changed the base branch from develop to master July 27, 2021 08:10
baziorek
baziorek requested changes Jul 27, 2021
View reviewed changes
Copy link

@baziorek baziorek left a comment

Choose a reason for hiding this comment

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

Code looks quite good, just few changes before we send its to iroha-core-team for review.

@Pawlak00 Pawlak00 changed the title extending TxPaginationMeta in queries Extending TxPaginationMeta in queries Jul 27, 2021
baziorek
baziorek approved these changes Jul 27, 2021
View reviewed changes
Copy link

@baziorek baziorek left a comment

Choose a reason for hiding this comment

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

It looks OK for me. You can change its from draft PR into normal PR.

@Pawlak00 Pawlak00 marked this pull request as ready for review July 27, 2021 20:04
@iceseer iceseer self-requested a review September 7, 2021 11:47
@iceseer iceseer changed the base branch from main to develop September 7, 2021 11:48
@iceseer iceseer changed the base branch from develop to main September 7, 2021 11:49
@iceseer
Copy link

iceseer commented Sep 7, 2021

Make plz this branch on top of develop branch. You can make hard reset and cherry pick commits.

@iceseer iceseer self-requested a review September 7, 2021 11:51
kuvaldini
kuvaldini suggested changes Sep 7, 2021
View reviewed changes
@Pawlak00 Pawlak00 changed the base branch from main to develop September 9, 2021 12:00
@Pawlak00
quries extended
833667b 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
example added
630b0cb 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
docs comment added
66738bd 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
schema changed
371507f 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
PR changes
2827ba6 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
formatting fixed
6626b5f 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
formatting fixed
b4d56f9 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
formatting fixed
1a7dee2 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
ordering added
7df3aee 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
edge case fix, now 0 passed as height or timestamp is passing
7909efc 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
whitespace
529f0cc 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
review fixes
dfe9f03 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
review fixes
7fec212 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
PaginationMeta in GetPendingTransactions
2594bf9 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00 Pawlak00 requested a review from kuvaldini September 9, 2021 12:35
baziorek
baziorek approved these changes Sep 9, 2021
View reviewed changes
Copy link

@baziorek baziorek left a comment

Choose a reason for hiding this comment

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

Code is still correct after fixing issues. Just few small things to correct

@baziorek
Copy link

baziorek commented Sep 9, 2021 •
edited
Loading

Make plz this branch on top of develop branch. You can make hard reset and cherry pick commits.

@iceseer Note: develop was updated 19 Apr 2019, but main 13 July. So the PR would also update develop. Currently it contains also other changes not made by @Pawlak00.

@Pawlak00
review fix
e45d980 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
examples/query_transactions.py
6df1cc9 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
Copy link
Author

Pawlak00 commented Sep 9, 2021

Make plz this branch on top of develop branch. You can make hard reset and cherry pick commits.

@iceseer Note: develop was updated 19 Apr 2019, but main 13 July. So the PR would also update develop. Currently it contains also other changes not made by @Pawlak00.

I will solve it soon (today)

@Pawlak00
fix
ca0e28f 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
fix
20eca32 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
fix
f3200b4 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
fix
2556fe8 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
fix
e7a4ba9 
Signed-off-by: Piotr Pawlowski <[email protected]>
@Pawlak00
Copy link
Author

I think it is ready @iceseer @kuvaldini

@kuvaldini kuvaldini merged commit 68f4255 into hyperledger-iroha:develop Sep 10, 2021
@Pawlak00 Pawlak00 mentioned this pull request Nov 10, 2021
Closed
baziorek pushed a commit to baziorek/iroha-python that referenced this pull request Feb 28, 2022
@Pawlak00 @baziorek
Extending TxPaginationMeta in queries (hyperledger-iroha#77)
67b1070 
* 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 <[email protected]>
@baziorek baziorek mentioned this pull request Feb 28, 2022
Merged
baziorek pushed a commit to baziorek/iroha-python that referenced this pull request Feb 28, 2022
@Pawlak00 @baziorek
Extending TxPaginationMeta in queries (hyperledger-iroha#77)
08b6038 
* 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 <[email protected]>
Signed-off-by: G.Bazior <[email protected]>
baziorek pushed a commit to baziorek/iroha-python that referenced this pull request Feb 28, 2022
@Pawlak00 @baziorek
Extending TxPaginationMeta in queries (hyperledger-iroha#77)
665569d 
* 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 <[email protected]>
Signed-off-by: G.Bazior <[email protected]>
baziorek pushed a commit to baziorek/iroha-python that referenced this pull request Feb 28, 2022
@Pawlak00 @baziorek
Extending TxPaginationMeta in queries (hyperledger-iroha#77)
c325471 
* 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 <[email protected]>
Signed-off-by: G.Bazior <[email protected]>
baziorek added a commit to baziorek/iroha-python that referenced this pull request Mar 2, 2022
@baziorek
Added missing changes from Pawlak00@b6d7f42 corrected in hyperledger-…
154cd46 
…iroha#77

Signed-off-by: G.Bazior <[email protected]>
baziorek added a commit that referenced this pull request Mar 23, 2022
@baziorek @Pawlak00
@stepanLav @turbopape
cherry-pick new features from develop -> main (#97)
e0a4f9b 
* 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 <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>

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

Signed-off-by: G.Bazior <[email protected]>

Co-authored-by: Grzegorz Bazior <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

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

Signed-off-by: G.Bazior <[email protected]>

* Tab -> spaces

Signed-off-by: G.Bazior <[email protected]>

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

Signed-off-by: Stepan Lavrentev <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>

* Add :param ordering_sequence:

Signed-off-by: Rafik Naccache <[email protected]>

* Fix wrong example for :param ordering_sequence:

Signed-off-by: Rafik Naccache <[email protected]>

* 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 <[email protected]>

* remove redundant OR clause to manage ordering_sequence

Signed-off-by: Rafik Naccache <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

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

Signed-off-by: G.Bazior <[email protected]>

Co-authored-by: Piotr Pawłowski <[email protected]>
Co-authored-by: Grzegorz Bazior <[email protected]>
Co-authored-by: Stepan Lavrentev <[email protected]>
Co-authored-by: Rafik NACCACHE <[email protected]>
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 <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>

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

Signed-off-by: G.Bazior <[email protected]>

Co-authored-by: Grzegorz Bazior <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

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

Signed-off-by: G.Bazior <[email protected]>

* Tab -> spaces

Signed-off-by: G.Bazior <[email protected]>

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

Signed-off-by: Stepan Lavrentev <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>

* Add :param ordering_sequence:

Signed-off-by: Rafik Naccache <[email protected]>

* Fix wrong example for :param ordering_sequence:

Signed-off-by: Rafik Naccache <[email protected]>

* 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 <[email protected]>

* remove redundant OR clause to manage ordering_sequence

Signed-off-by: Rafik Naccache <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>
Signed-off-by: G.Bazior <[email protected]>

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

Signed-off-by: G.Bazior <[email protected]>

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

* Refactoring of example tx-example.py

Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>

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

Signed-off-by: G.Bazior <[email protected]>

* 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 <[email protected]>

* Add autorestart to iroha

Signed-off-by: Alexey Rodionov <[email protected]>

* Cherry-pick fix

Signed-off-by: G.Bazior <[email protected]>

* Generated python files from protobuf on Ubuntu:20.04

Signed-off-by: G.Bazior <[email protected]>

* Dependencies fix

Signed-off-by: G.Bazior <[email protected]>

* Added space in logging after review

Signed-off-by: G.Bazior <[email protected]>

* Made import in code more readable after review

Signed-off-by: G.Bazior <[email protected]>

Signed-off-by: Piotr Pawlowski <[email protected]>
Signed-off-by: G.Bazior <[email protected]>
Signed-off-by: Stepan Lavrentev <[email protected]>
Signed-off-by: Rafik Naccache <[email protected]>
Signed-off-by: Alexey Rodionov <[email protected]>
Co-authored-by: Piotr Pawłowski <[email protected]>
Co-authored-by: Grzegorz Bazior <[email protected]>
Co-authored-by: Stepan Lavrentev <[email protected]>
Co-authored-by: Rafik NACCACHE <[email protected]>
Co-authored-by: Alexey Rodionov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kamilsa kamilsa kamilsa approved these changes

@baziorek baziorek baziorek approved these changes

@kuvaldini kuvaldini kuvaldini approved these changes

@iceseer iceseer Awaiting requested review from iceseer

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

Successfully merging this pull request may close these issues.
5 participants
@Pawlak00 @baziorek @iceseer @kamilsa @kuvaldini