test: Refactor rpc_fundrawtransaction.py #25291
Closed
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
brunoerg
reviewed
Jun 7, 2022
| self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.0) | ||
| self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 5.0) | ||
|
|
||
| self.generate(self.nodes[0], 1) |
There was a problem hiding this comment.
Did you duplicate this self.generate(self.nodes[0], 1), any reason? You moved it to here but you also added it in L684.
There was a problem hiding this comment.
Yes, generate mines a block so it has been duplicated to confirm the transactions preceding it.
There was a problem hiding this comment.
It's only a suggestion, but I think this way would fit better.
diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py
index 338c31eea..71fda6362 100755
--- a/test/functional/rpc_fundrawtransaction.py
+++ b/test/functional/rpc_fundrawtransaction.py
@@ -103,13 +103,7 @@ class RawTransactionsTest(BitcoinTestFramework):
self.generate(self.nodes[2], 1)
self.generate(self.nodes[0], 121)
- # coins for simple tests
- self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.5)
- self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.0)
- self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 5.0)
-
- self.generate(self.nodes[0], 1)
-
+ self.test_watchonly()
self.test_change_position()
self.test_simple()
self.test_simple_two_outputs()
@@ -132,7 +126,6 @@ class RawTransactionsTest(BitcoinTestFramework):
self.test_many_inputs_fee()
self.test_many_inputs_send()
self.test_op_return()
- self.test_watchonly()
self.test_all_watched_funds()
self.test_option_feerate()
self.test_address_reuse()
@@ -681,6 +674,11 @@ class RawTransactionsTest(BitcoinTestFramework):
self.nodes[0].lockunspent(False, [{"txid": self.watchonly_txid, "vout": self.watchonly_vout}])
self.nodes[0].sendtoaddress(self.nodes[3].get_wallet_rpc(self.default_wallet_name).getnewaddress(), self.watchonly_amount / 10)
+ # coins for simple tests
+ self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.5)
+ self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.0)
+ self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 5.0)
+
self.generate(self.nodes[0], 1)
inputs = []|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsNo conflicts as of last run. |
This was referenced Jun 8, 2022
|
Looks like the test fails: https://cirrus-ci.com/task/5430192075177984?logs=ci#L3248 |
The failing test is testing wether fundrawtransaction selects enough fees to cover the transaction after signing. Changes made in this PR should at most change the available coins inside the wallet. I can't think of any reason for this test failing, other than there being some edge case in the fundrawtransaction's fees mechanism that these changes have chanced upon. |
The current test_simple_two_coins and test_simple are identical and redundant. The test_simple_two_coins was changed in pr#6417 and asserts ensuring the use of two input coins were removed.
The current method assumes that a coin with value > 2 BTC was used to fund the transaction, and therefore change will be greater than 1 BTC. This can fail. changepos allows us to get the change output much more reliably and cleanly.
1bddea8 to
00af305
Compare
|
rebased. |
00af305 to
25b9f2e
Compare
|
I don't know either why it happens. Though, this can not be merged with a failing test. |
25b9f2e to
3e5bc2c
Compare
|
The failing test passed after removing the 3rd commit. |
|
You'll have to adjust the pull request description? |
|
Closing this as it has not had a lot of conceptual support. If you are interested in continuing work on this, please leave a comment so that it can be reopened. |
|
The changes look correct to me |
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.
Made 2 changes to
tests/functional/rpc_fundrawtransaction.py-