Merge bitcoin/bitcoin#25171: rpc: wallet: remove -deprecatedrpc=exclude_coinbase logic

a4703ce9d7 doc: add release notes about removal of the `deprecatedrpc=exclude_coinbase` (Sebastian Falbesoner)
ef0aa74836 rpc: wallet: remove `-deprecatedrpc=exclude_coinbase` logic (Sebastian Falbesoner)

Pull request description:

  Including coinbase transactions in `receivedby` RPCs and adding the `-deprecatedrpc=exclude_coinbase` was done in PR #14707 (released in v23.0). For the next release v24.0, this configuration option can be removed.

ACKs for top commit:
  fanquake:
    ACK a4703ce9d7

Tree-SHA512: 97cd4e78501e64f678c78d2ebb5be5376688c023e34fced71dd24e432d27aa31a74b5483545f49ba0bdf48656d8b8b7bee74e3db26cf6daf112613f1caa4dfa4
This commit is contained in:
MacroFake
2022-05-20 08:48:00 +01:00
4 changed files with 9 additions and 49 deletions

View File

@ -18,8 +18,6 @@ from test_framework.wallet_util import test_address
class ReceivedByTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 2
# Test deprecated exclude coinbase on second node
self.extra_args = [[], ["-deprecatedrpc=exclude_coinbase"]]
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
@ -250,35 +248,6 @@ class ReceivedByTest(BitcoinTestFramework):
{"label": label},
{}, True)
# Test exclude_coinbase
address2 = self.nodes[1].getnewaddress(label)
self.generatetoaddress(self.nodes[1], COINBASE_MATURITY + 1, address2, sync_fun=self.no_op)
self.log.info("getreceivedbyaddress returns nothing when excluding coinbase")
balance = self.nodes[1].getreceivedbyaddress(address2)
assert_equal(balance, 0)
self.log.info("getreceivedbylabel returns nothing when excluding coinbase")
balance = self.nodes[1].getreceivedbylabel("label")
assert_equal(balance, 0)
self.log.info("listreceivedbyaddress does not include address when excluding coinbase")
assert_array_result(self.nodes[1].listreceivedbyaddress(),
{"address": address2},
{}, True)
self.log.info("listreceivedbylabel does not include label when excluding coinbase")
assert_array_result(self.nodes[1].listreceivedbylabel(),
{"label": label},
{}, True)
self.log.info("getreceivedbyaddress throws when setting include_immature_coinbase with deprecated exclude_coinbase")
assert_raises_rpc_error(-8, 'include_immature_coinbase is incompatible with deprecated exclude_coinbase', self.nodes[1].getreceivedbyaddress, address2, 1, True)
self.log.info("listreceivedbyaddress throws when setting include_immature_coinbase with deprecated exclude_coinbase")
assert_raises_rpc_error(-8, 'include_immature_coinbase is incompatible with deprecated exclude_coinbase', self.nodes[1].listreceivedbyaddress, 1, False, False, "", True)
if __name__ == '__main__':
ReceivedByTest().main()