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
[Tests] Tidy up REST interface functional tests #12766
Conversation
@jnewbery Please let me know what else could be improved in the tests :) |
394551c
to
a3d0946
Compare
Will review after #12717 is merged (feel free to ping me again once that happens!) |
It's merged, please rebase (so that this is only test changes). |
5d42265
to
dcefc24
Compare
dcefc24
to
d54e3e7
Compare
@jnewbery Ping :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested ACK d54e3e704838eb39a5e6e33d8b530c6ed404fd49. One comment inline.
Commits can probably be squashed a bit before merge. Feel free to take my changes without the commit messages if that makes things more structured.
test/functional/interface_rest.py
Outdated
assert_equal(tx['txid'] in txs, True) | ||
# Check if the 3 tx show up in the new block | ||
json_obj = self.test_rest_request("/block/{}".format(newblockhash[0])) | ||
non_coinbase_txs = [tx['txid'] for tx in json_obj['tx'] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if ordering is guaranteed here. Perhaps construct sets and check for set equality?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good - done.
d54e3e7
to
7304c0b
Compare
Also refactor txout index parsing and formatting.
We use assert_greater_than_or_equal(), since the hex response contains an extra b'\n' traling byte.
7304c0b
to
55efc1f
Compare
Squashed most of the small commits into a few large ones. |
Tested ACK 55efc1f. Nicely structured PR. Very easy to review! Thanks |
utACK 55efc1f |
55efc1f [tests] simplify binary and hex response parsing in interface_rest.py (Roman Zeyde) ade5964 [tests] only use 2 nodes in interface_rest.py (John Newbery) ad00fbe [tests] refactor interface_rest.py to avoid code repetition (John Newbery) 7a3181a [tests] Make json request building more consistent in interface_rest.py (John Newbery) 3fd4490 [tests] improve logging and documentation in interface_rest.py (John Newbery) abf190e [tests] fix flake8 warnings in interface_rest.py test (John Newbery) Pull request description: Following the comment at #12717 (review). Tree-SHA512: b55560f0d8f3069584f5a2398285483a0a23514b2b2bd2c1ced2db1cb30dc24f60f720d0fa4de30259f7918d3178d94680ae9321649544d1d04d687a2e672559
55efc1f [tests] simplify binary and hex response parsing in interface_rest.py (Roman Zeyde) ade5964 [tests] only use 2 nodes in interface_rest.py (John Newbery) ad00fbe [tests] refactor interface_rest.py to avoid code repetition (John Newbery) 7a3181a [tests] Make json request building more consistent in interface_rest.py (John Newbery) 3fd4490 [tests] improve logging and documentation in interface_rest.py (John Newbery) abf190e [tests] fix flake8 warnings in interface_rest.py test (John Newbery) Pull request description: Following the comment at bitcoin#12717 (review). Tree-SHA512: b55560f0d8f3069584f5a2398285483a0a23514b2b2bd2c1ced2db1cb30dc24f60f720d0fa4de30259f7918d3178d94680ae9321649544d1d04d687a2e672559
55efc1f [tests] simplify binary and hex response parsing in interface_rest.py (Roman Zeyde) ade5964 [tests] only use 2 nodes in interface_rest.py (John Newbery) ad00fbe [tests] refactor interface_rest.py to avoid code repetition (John Newbery) 7a3181a [tests] Make json request building more consistent in interface_rest.py (John Newbery) 3fd4490 [tests] improve logging and documentation in interface_rest.py (John Newbery) abf190e [tests] fix flake8 warnings in interface_rest.py test (John Newbery) Pull request description: Following the comment at bitcoin#12717 (review). Tree-SHA512: b55560f0d8f3069584f5a2398285483a0a23514b2b2bd2c1ced2db1cb30dc24f60f720d0fa4de30259f7918d3178d94680ae9321649544d1d04d687a2e672559
55efc1f [tests] simplify binary and hex response parsing in interface_rest.py (Roman Zeyde) ade5964 [tests] only use 2 nodes in interface_rest.py (John Newbery) ad00fbe [tests] refactor interface_rest.py to avoid code repetition (John Newbery) 7a3181a [tests] Make json request building more consistent in interface_rest.py (John Newbery) 3fd4490 [tests] improve logging and documentation in interface_rest.py (John Newbery) abf190e [tests] fix flake8 warnings in interface_rest.py test (John Newbery) Pull request description: Following the comment at bitcoin#12717 (review). Tree-SHA512: b55560f0d8f3069584f5a2398285483a0a23514b2b2bd2c1ced2db1cb30dc24f60f720d0fa4de30259f7918d3178d94680ae9321649544d1d04d687a2e672559
55efc1f [tests] simplify binary and hex response parsing in interface_rest.py (Roman Zeyde) ade5964 [tests] only use 2 nodes in interface_rest.py (John Newbery) ad00fbe [tests] refactor interface_rest.py to avoid code repetition (John Newbery) 7a3181a [tests] Make json request building more consistent in interface_rest.py (John Newbery) 3fd4490 [tests] improve logging and documentation in interface_rest.py (John Newbery) abf190e [tests] fix flake8 warnings in interface_rest.py test (John Newbery) Pull request description: Following the comment at bitcoin#12717 (review). Tree-SHA512: b55560f0d8f3069584f5a2398285483a0a23514b2b2bd2c1ced2db1cb30dc24f60f720d0fa4de30259f7918d3178d94680ae9321649544d1d04d687a2e672559
55efc1f [tests] simplify binary and hex response parsing in interface_rest.py (Roman Zeyde) ade5964 [tests] only use 2 nodes in interface_rest.py (John Newbery) ad00fbe [tests] refactor interface_rest.py to avoid code repetition (John Newbery) 7a3181a [tests] Make json request building more consistent in interface_rest.py (John Newbery) 3fd4490 [tests] improve logging and documentation in interface_rest.py (John Newbery) abf190e [tests] fix flake8 warnings in interface_rest.py test (John Newbery) Pull request description: Following the comment at bitcoin#12717 (review). Tree-SHA512: b55560f0d8f3069584f5a2398285483a0a23514b2b2bd2c1ced2db1cb30dc24f60f720d0fa4de30259f7918d3178d94680ae9321649544d1d04d687a2e672559
Following the comment at #12717 (review).