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

[test] Rename rpc_timewait to rpc_timeout #15026

Merged
merged 3 commits into from Dec 29, 2018

Conversation

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Dec 22, 2018

This is a bugfix, since wallet_dump currently uses the wrong name:

def set_test_params(self):
self.num_nodes = 1
self.extra_args = [["-keypool=90", "-addresstype=legacy"]]
self.rpc_timeout = 120

Rename all to the same name with a scripted diff (and some unrelated cleanups).

MarcoFalke added 3 commits Dec 22, 2018
-BEGIN VERIFY SCRIPT-
sed -i -e 's/, split=False//g' $(git grep -l 'def setup_network')
-END VERIFY SCRIPT-
-BEGIN VERIFY SCRIPT-
sed -i -e 's/self.rpc_timewait/self.rpc_timeout/g' $(git grep -l self.rpc_timewait)
-END VERIFY SCRIPT-
@gkrizek
Copy link
Contributor

@gkrizek gkrizek commented Dec 22, 2018

utACK 4999992

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Dec 24, 2018

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #8994 (Testchains: Introduce custom chain whose constructor... by jtimon)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@promag
Copy link
Member

@promag promag commented Dec 26, 2018

utACK 4999992.

MarcoFalke added a commit to MarcoFalke/bitcoin-core that referenced this issue Dec 29, 2018
4999992 whitespace: Split ~300 char line into multiple ones (MarcoFalke)
fa71b38 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke)
fa3e578 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke)

Pull request description:

  This is a bugfix, since wallet_dump currently uses the wrong name:

  https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92

  Rename all to the same name with a scripted diff (and some unrelated cleanups).

Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
@MarcoFalke MarcoFalke merged commit 4999992 into bitcoin:master Dec 29, 2018
2 checks passed
@MarcoFalke MarcoFalke deleted the Mf1812-testRpcTimeout branch Dec 29, 2018
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 8, 2021
4999992 whitespace: Split ~300 char line into multiple ones (MarcoFalke)
fa71b38 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke)
fa3e578 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke)

Pull request description:

  This is a bugfix, since wallet_dump currently uses the wrong name:

  https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92

  Rename all to the same name with a scripted diff (and some unrelated cleanups).

Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 11, 2021
4999992 whitespace: Split ~300 char line into multiple ones (MarcoFalke)
fa71b38 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke)
fa3e578 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke)

Pull request description:

  This is a bugfix, since wallet_dump currently uses the wrong name:

  https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92

  Rename all to the same name with a scripted diff (and some unrelated cleanups).

Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 11, 2021
4999992 whitespace: Split ~300 char line into multiple ones (MarcoFalke)
fa71b38 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke)
fa3e578 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke)

Pull request description:

  This is a bugfix, since wallet_dump currently uses the wrong name:

  https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92

  Rename all to the same name with a scripted diff (and some unrelated cleanups).

Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 13, 2021
4999992 whitespace: Split ~300 char line into multiple ones (MarcoFalke)
fa71b38 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke)
fa3e578 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke)

Pull request description:

  This is a bugfix, since wallet_dump currently uses the wrong name:

  https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92

  Rename all to the same name with a scripted diff (and some unrelated cleanups).

Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 15, 2021
4999992 whitespace: Split ~300 char line into multiple ones (MarcoFalke)
fa71b38 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke)
fa3e578 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke)

Pull request description:

  This is a bugfix, since wallet_dump currently uses the wrong name:

  https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92

  Rename all to the same name with a scripted diff (and some unrelated cleanups).

Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants