Extending TxPaginationMeta in queries by Pawlak00 · Pull Request #77 · hyperledger-iroha/iroha-python

Pawlak00 · 2021-07-22T06:34:36Z

Using extended TxPaginationMeta in iroha-python library.

baziorek · 2021-07-22T07:23:34Z

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

@Pawlak00 I suggest to rebase with destination branch

baziorek

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

iroha/iroha.py

examples/tx-example.py

baziorek

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

iceseer · 2021-09-07T11:50:41Z

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

examples/tx-example.py

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

baziorek

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

examples/query_transactions.py

baziorek · 2021-09-09T12:51:23Z

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.

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

Pawlak00 · 2021-09-09T13:00:52Z

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)

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

Pawlak00 · 2021-09-10T08:55:32Z

I think it is ready @iceseer @kuvaldini

* 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>

* 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>

…iroha#77 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> * 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> 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>

* 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>

Pawlak00 changed the base branch from develop to master July 27, 2021 08:10

baziorek requested changes Jul 27, 2021

View reviewed changes

Pawlak00 changed the title ~~extending TxPaginationMeta in queries~~ Extending TxPaginationMeta in queries Jul 27, 2021

baziorek approved these changes Jul 27, 2021

View reviewed changes

Pawlak00 marked this pull request as ready for review July 27, 2021 20:04

iceseer self-requested a review September 7, 2021 11:47

iceseer approved these changes Sep 7, 2021

View reviewed changes

iceseer changed the base branch from main to develop September 7, 2021 11:48

iceseer changed the base branch from develop to main September 7, 2021 11:49

iceseer self-requested a review September 7, 2021 11:51

kuvaldini suggested changes Sep 7, 2021

View reviewed changes

examples/tx-example.py Outdated Show resolved Hide resolved

examples/tx-example.py Outdated Show resolved Hide resolved

examples/tx-example.py Outdated Show resolved Hide resolved

Pawlak00 changed the base branch from main to develop September 9, 2021 12:00

Pawlak00 force-pushed the master branch from ad34289 to f1bdb29 Compare September 9, 2021 12:30

Pawlak00 added 14 commits September 9, 2021 14:31

quries extended

833667b

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

example added

630b0cb

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

docs comment added

66738bd

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

schema changed

371507f

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

PR changes

2827ba6

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

formatting fixed

6626b5f

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

formatting fixed

b4d56f9

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

formatting fixed

1a7dee2

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

ordering added

7df3aee

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

edge case fix, now 0 passed as height or timestamp is passing

7909efc

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

whitespace

529f0cc

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

review fixes

dfe9f03

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

review fixes

7fec212

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

PaginationMeta in GetPendingTransactions

2594bf9

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

Pawlak00 force-pushed the master branch from f1bdb29 to 2594bf9 Compare September 9, 2021 12:31

Pawlak00 requested a review from kuvaldini September 9, 2021 12:35

baziorek approved these changes Sep 9, 2021

View reviewed changes

Pawlak00 added 2 commits September 9, 2021 14:51

review fix

e45d980

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

examples/query_transactions.py

6df1cc9

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

Pawlak00 added 5 commits September 9, 2021 16:14

fix

ca0e28f

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

fix

20eca32

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

fix

f3200b4

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

fix

2556fe8

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

fix

e7a4ba9

Signed-off-by: Piotr Pawlowski <ppiotru@gmail.com>

kuvaldini approved these changes Sep 10, 2021

View reviewed changes

kamilsa approved these changes Sep 10, 2021

View reviewed changes

kuvaldini merged commit 68f4255 into hyperledger-iroha:develop Sep 10, 2021

Pawlak00 mentioned this pull request Nov 10, 2021

TxPaginationMeta not working in GetPendingTransactions #78

Closed

baziorek mentioned this pull request Feb 28, 2022

cherry-pick new features from develop -> main #97

Merged

baziorek added a commit to baziorek/iroha-python that referenced this pull request Mar 2, 2022

Added missing changes from Pawlak00@b6d7f42 corrected in hyperledger-…

154cd46

…iroha#77 Signed-off-by: G.Bazior <bazior@agh.edu.pl>

Conversation

Pawlak00 commented Jul 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

baziorek commented Jul 22, 2021

Uh oh!

baziorek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

baziorek left a comment

Choose a reason for hiding this comment

Uh oh!

iceseer commented Sep 7, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

baziorek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

baziorek commented Sep 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Pawlak00 commented Sep 9, 2021

Uh oh!

Pawlak00 commented Sep 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Pawlak00 commented Jul 22, 2021 •

edited

Loading

baziorek commented Sep 9, 2021 •

edited

Loading