Skip to content
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] Move deterministic address import to setup_nodes #14631

Merged
merged 1 commit into from Nov 2, 2018

Conversation

Projects
None yet
5 participants
@jnewbery
Copy link
Member

commented Nov 1, 2018

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 (comment).

@ryanofsky
Copy link
Contributor

left a comment

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

test/functional/wallet_listreceivedby.py Outdated
super().import_deterministic_coinbase_privkeys()
self.num_cb_reward_addresses = len(self.nodes[1].listreceivedbyaddress(minconf=0, include_empty=True, include_watchonly=True))
def setup_network(self):
super().setup_network()

This comment has been minimized.

Copy link
@ryanofsky

ryanofsky Nov 1, 2018

Contributor

Maybe needs comment. Why override if just calling super?

This comment has been minimized.

Copy link
@jnewbery

jnewbery Nov 1, 2018

Author Member

oops. vestigial from a previous version. Removed.

[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).

@jnewbery jnewbery force-pushed the jnewbery:deprecate_generate2 branch to 3fd7e76 Nov 1, 2018

@fanquake fanquake added the Tests label Nov 1, 2018

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Nov 1, 2018

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

Conflicts

No conflicts as of last run.

@ryanofsky
Copy link
Contributor

left a comment

utACK 3fd7e76, only change since last review is removing unneeded override.

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Nov 2, 2018

utACK 3fd7e76

@MarcoFalke MarcoFalke merged commit 3fd7e76 into bitcoin:master Nov 2, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

MarcoFalke added a commit that referenced this pull request Nov 2, 2018

Merge #14631: [tests] Move deterministic address import to setup_nodes
3fd7e76 [tests] Move deterministic address import to setup_nodes (John Newbery)

Pull request description:

  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 (comment).

Tree-SHA512: 2b32edf500e286c463398487ab1153116a1dc90f64a53614716373311abdc83d8a251fdd8f42d1146b56e308664deaf62952113f66e98bc37f23968096d1a961
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.