[tests] Move deterministic address import to setup_nodes #14631

pull jnewbery wants to merge 1 commits into bitcoin:master from jnewbery:deprecate_generate2 changing 10 files +21 −42

jnewbery commented at 3:12 PM on November 1, 2018: member

This requires a small changes to a few tests, but means that deterministic addresses will always be imported (unless setup_nodes behaviour is explicitly overridden).

Tidies up the way we import deterministic addresses, requested in review comment here: #14468 (review).

in test/functional/wallet_listreceivedby.py:22 in ef91935ad0 outdated

  17 | @@ -18,10 +18,8 @@ class ReceivedByTest(BitcoinTestFramework):
  18 |      def set_test_params(self):
  19 |          self.num_nodes = 2
  20 |  
  21 | -    def import_deterministic_coinbase_privkeys(self):
  22 | -        assert_equal(0, len(self.nodes[1].listreceivedbyaddress(minconf=0, include_empty=True, include_watchonly=True)))
  23 | -        super().import_deterministic_coinbase_privkeys()
  24 | -        self.num_cb_reward_addresses = len(self.nodes[1].listreceivedbyaddress(minconf=0, include_empty=True, include_watchonly=True))
  25 | +    def setup_network(self):
  26 | +        super().setup_network()

ryanofsky commented at 3:33 PM on November 1, 2018:

Maybe needs comment. Why override if just calling super?

jnewbery commented at 4:53 PM on November 1, 2018:

oops. vestigial from a previous version. Removed.

ryanofsky approved
ryanofsky commented at 3:36 PM on November 1, 2018: member

utACK ef91935ad045b60017924c990983bc0474f26ec0. I only superficially understand this change, but it seems to do what's described and simplify things.

[tests] Move deterministic address import to setup_nodes

This requires a small changes to a few tests, but means that
deterministic addresses will always be imported (unless setup_nodes
behaviour is explicitly overridden).

3fd7e76f6d

jnewbery force-pushed on Nov 1, 2018
fanquake added the label Tests on Nov 1, 2018
DrahtBot commented at 11:41 PM on November 1, 2018: member



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

No conflicts as of last run.
ryanofsky approved
ryanofsky commented at 3:14 PM on November 2, 2018: member

utACK 3fd7e76f6d4b4eae0b36d9b33376274f5387a6f3, only change since last review is removing unneeded override.
MarcoFalke commented at 3:42 PM on November 2, 2018: member

utACK 3fd7e76f6d
MarcoFalke merged this on Nov 2, 2018
MarcoFalke closed this on Nov 2, 2018
MarcoFalke referenced this in commit c34c821e4c on Nov 2, 2018
deadalnix referenced this in commit 59810d76a2 on May 6, 2020
deadalnix referenced this in commit 04a2679816 on May 6, 2020
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#14468 [wallet] Deprecate generate RPC method

[tests] Move deterministic address import to setup_nodes #14631

Conflicts