test: use MiniWallet to simplify mempool_package_limits.py tests #25379
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsNo conflicts as of last run. |
maflcko
reviewed
Jun 21, 2022
2b55bd3 to
fab7280
Compare
754874c to
1c9243b
Compare
|
Forced-pushed to take advantage of the logic introduced in #25445 |
maflcko
approved these changes
Aug 1, 2022
There was a problem hiding this comment.
lgtm 1c9243b 🐐
Show signature
Signature:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
lgtm 1c9243b40db5746575ed55d09774872f0a98b24a 🐐
-----BEGIN PGP SIGNATURE-----
iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
pUjMzgv8Ck6nSSmgAatlxCMG837PArkz0UTGPh4ek3WbN73Mn1dLmSCBsvlzbSVG
4yQlx+vMpDNUrJO07nU7fVszAKK5+BOFUcd1pElpZbIoOWHIudbDdEuOeOIDjuKC
368yHXtcXZUnx4ZUGJvC11LtkH2eZxjrwt70iVWqoNWMz2Wj3dNS01VGOkAN6Bb2
8wUWoNYwgm+iTNJIsQnzPuc9I7qjhILvhcbMTXKX/NQQi4StPq+5nBRFIXSePSuD
ApxcDIGIB2s3cYu/SswObSHtCtRKt/gaG0Xd7OkOMZ8bpNPU0vWiRAFtRn5OhKj7
2csGoyU1prVU52njdCYaC/EAiyWumqBmw/4CtffajgZ4UJluPhvn2ZBjAJDq9DAb
SiFfaITnyqEA327CahBPIkyTXmL15HC0zipUDjs0U5YYLby2z05h6i9htpQv+iCJ
eH1N+nmixN9aA6v1gkXNEs7qVcVWWLhLUuatmxzgaEr5pdhn+7701yNirhqu004l
JrbTuRmo
=dEET
-----END PGP SIGNATURE-----
| from test_framework.util import ( | ||
| assert_equal, | ||
| ) | ||
| from test_framework.wallet import ( | ||
| bulk_transaction, |
There was a problem hiding this comment.
Can remove all of these functions now?
There was a problem hiding this comment.
create_child_with_parents and make_chain are still used in rpc_packages.py from which I anticipate to remove on a follow-up PR.
8f11c3d to
b43ff6c
Compare
|
Also, should be rebased |
b43ff6c to
48afe03
Compare
kouloumos
commented
Aug 1, 2022
There was a problem hiding this comment.
Rebased and addressed @MarcoFalke comments.
The failing CI task is also on master, it seems not to be related with the changes.
| from test_framework.util import ( | ||
| assert_equal, | ||
| ) | ||
| from test_framework.wallet import ( | ||
| bulk_transaction, |
There was a problem hiding this comment.
create_child_with_parents and make_chain are still used in rpc_packages.py from which I anticipate to remove on a follow-up PR.
maflcko
reviewed
Aug 1, 2022
Moved `bulk_transaction` into MiniWallet class as `_bulk_tx` private helper method to be used when the newly added `target_weight` option is passed to `create_self_transfer*`
With this new method, a chain of transactions can be created. This method is introduced to further simplify the mempool_package_limits.py tests.
48afe03 to
f2f6068
Compare
|
ACK f2f6068 👜 Show signatureSignature: |
glozow
reviewed
Aug 2, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While
wallet.pyincludes the MiniWallet class and some helper methods, it also includes some methods that have been moved there without having any direct relation with the MiniWallet class. Specificallymake_chain,create_child_with_parentsandcreate_raw_chainmethods that were extracted fromrpc_packages.pyat f8253d6 in order to be used on bothmempool_package_limits.pyandrpc_packages.py.Since that change, due to the introduction of additional methods in MiniWallet, the functionality of those methods can now be replicated with the existing MiniWallet methods and simultaneously simplify those tests by using the MiniWallet.
This PR's goals are
mempool_package_limits.pyfunctional tests with usage of the MiniWallet.make_chain,create_child_with_parentsandcreate_raw_chainmethods ofwallet.py.For the purpose of the aforementioned goals, a helper method
MiniWallet.send_self_transfer_chainis introduced and methodbulk_transactionhas been integrated increate_self_transfer*methods using an optionaltarget_weightoption.