Skip to content

Conversation

@jtimon
Copy link
Contributor

@jtimon jtimon commented Aug 22, 2019

Separated from #8994 as suggested by MarcoFalke and Sjors in #8994 (comment)

You can't really test the qt changes on their own, so to test them, use #8994 .

@DrahtBot
Copy link
Contributor

DrahtBot commented Aug 22, 2019

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #16411 (Signet support by kallewoof)
  • #15934 (Separate settings merging from parsing by ryanofsky)
  • #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.

@jtimon jtimon force-pushed the b19-testchains-qt branch from 5a21981 to dba00d2 Compare August 29, 2019 12:14
@jtimon
Copy link
Contributor Author

jtimon commented Aug 29, 2019

Fixed @MarcoFalke 's nit and slightly improve documentation.

@Sjors
Copy link
Member

Sjors commented Aug 29, 2019

ACK dba00d2

It was fairly easy to cherry-pick these commits onto the signet PR (Sjors@df1846c & 124ee37, cc @kallewoof). By dropping the signet lines from the QT commit, I indeed get a purple client.

@kallewoof
Copy link
Contributor

Nice!

@jtimon
Copy link
Contributor Author

jtimon commented Aug 30, 2019

@Sjors sure, that's another way to test it, thanks.

Copy link
Member

@maflcko maflcko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 36f9573e82d370af76fed0789fe3d671546e6e85 (also run the test to verify that only error messages are responsible for change the hash)

Show signature and timestamp

Signature:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK 36f9573e82d370af76fed0789fe3d671546e6e85 (also run the test to verify that only error messages are responsible for change the hash)
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
pUga+Av/Y3yW/KQZwNdF7hYFnrmx2Oi6tYorQ3duhA1xTtkkNMZJn6VHS2qDDoOL
8OApQqJa8AQOQO+Ds1kkXQMq7PJzxaxh0kw31YvmQblZGKPsUUqziCbHF1GjFHWo
2GhY3x+sBuNhHyTXgS6EqiyEmEAE0B+1fb4xvAC7cna5RkexOR4JDu6n6I5PZDxu
5upGAB55q1014wUc1aNbEqFHwDmqiwAzIMIKgWSpaQoFKNOUsNl0MS/XpSTeNG7u
54LHuSoTyLJi+luhY0I+wqDMZuzgJeSZySlQFKDMzC0pVLoMYfO0qqcpDD4pkSkW
cg55tpewD4W/ljq4lFYTATtHzAy6mi3s/AN09TM/GE7DOyYdnSxPRyBrKaA039Ii
HCTUZtS1hv/gbs7l6aqUgWlNFwicSvqRSHWJ7IXmbqIS26E5R+e9i4II6mfcZsoD
GQXjYagSkdta8xydIaWDTHt6x2hXzYHXxtUyI6reJ+ObrCgsPjiWG6eA3aUoaaYv
iEIzcc2c
=ubtk
-----END PGP SIGNATURE-----

Timestamp of file with hash fe315895de9bcfebf0a22dee8eb70c8cd08dd7ba0736e8d0c931542ea93a4bd7 -

@maflcko maflcko added this to the 0.19.0 milestone Sep 6, 2019
@maflcko
Copy link
Member

maflcko commented Sep 7, 2019

ACK 3bf9d8c

Show signature and timestamp

Signature:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK 3bf9d8cac09fc88727ef2f2a2bea33b90b625e50
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
pUhhSgv/d0tNdJAcYe5izbrwgb32bUYpXXLrk7KdCxauZoGCVKsPxbK+iGx5nhZg
OcUun64mGXA9L6fMLFyByXZe1FND1CVNHF/b/5mxobmpaE5RqFq7DWhpcVNoXwe3
7CukYbaPMcqajlIsr1KHgetHQrs5Z7HQO4qC4+vvcVLTBd+X0LB61AKbEaDwVldp
oFKk4C7B9wNDfnUxGqjyBr671tfMgGVi+rDlmra4xedUd93PTRJ12fudf1pp9OcI
hvr8ablChiTG1EKbbfbXPcScpfsfjGc1ZI0z2wvKXKRSpe1pmoWLje9ySt0TUBN9
B8wRdozzk4Q63v+6X2+JvNzT7gIEJYi7wNgERipkTJAckWgwZ+jU3WgcB+yHkfrf
Kun/DULfIusSIqSJBKU8UKe3zCxH2ykhRJT3tzd7zB5k+QHGgWLq9ojLpBdfi/jm
hkhxq1TIqrMmwC3jXWnTH4P1Qtvx5Fiq4KB7RmXjuZ43EIIHMlet8gewhZRBH0X+
DXnwuC7C
=omI2
-----END PGP SIGNATURE-----

Timestamp of file with hash 9eb4317ea08a354e0ed72ca0faed34267277bab19a079787f864956aa279387d -

@jtimon jtimon mentioned this pull request Sep 7, 2019
4 tasks
maflcko pushed a commit that referenced this pull request Sep 10, 2019
3bf9d8c Testchains: Qt: Simplify network/chain styles (Jorge Timón)
052c54e Testchains: Generic selection with -chain=<str> in addition of -testnet and -regtest (Jorge Timón)

Pull request description:

  Separated from #8994 as suggested by MarcoFalke and Sjors in #8994 (comment)

  You can't really test the qt changes on their own, so to test them, use #8994 .

ACKs for top commit:
  MarcoFalke:
    ACK 3bf9d8c

Tree-SHA512: 5b5e6083ebc0a44505a507fac633e7af18037c85e5e73f5d1e6f7e730575d3297ba8a31d1c2441df623b273f061c32d8fa324f4aa6bead01d23e88582029b568
@maflcko maflcko merged commit 3bf9d8c into bitcoin:master Sep 10, 2019
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Sep 10, 2019
3bf9d8c Testchains: Qt: Simplify network/chain styles (Jorge Timón)
052c54e Testchains: Generic selection with -chain=<str> in addition of -testnet and -regtest (Jorge Timón)

Pull request description:

  Separated from bitcoin#8994 as suggested by MarcoFalke and Sjors in bitcoin#8994 (comment)

  You can't really test the qt changes on their own, so to test them, use bitcoin#8994 .

ACKs for top commit:
  MarcoFalke:
    ACK 3bf9d8c

Tree-SHA512: 5b5e6083ebc0a44505a507fac633e7af18037c85e5e73f5d1e6f7e730575d3297ba8a31d1c2441df623b273f061c32d8fa324f4aa6bead01d23e88582029b568
maflcko pushed a commit that referenced this pull request Feb 4, 2020
…nt tests

1abcecc Tests: Use self.chain instead of 'regtest' in almost all current tests (Jorge Timón)

Pull request description:

  Simply avoiding the hardcoded string in more places for consistency.
  It can also allow for more easily reusing tests for other chains other than regtest.

  Separated from #8994 .
  Continues #16509 .

  It is still not complete (ie to be complete, we need the -chain parameter in #16680 and make whether acceptnonstdtxs is allowed for that chain or not customizable for regtest [or for custom chains like in #8994 ] ). But while being incomplete like #16509 , it's quite simple to review and another step forward IMO.

ACKs for top commit:
  Sjors:
    re-ACK 1abcecc. I think it's an improvement even if incomplete and if some PR's might accidentally bring "regtest" back. Subsequent improvements hopefully don't have to touch 16 files.
  elichai:
    Code review ACK 1abcecc
  ryanofsky:
    Code review ACK 1abcecc.
  ryanofsky:
    Code review ACK 1abcecc

Tree-SHA512: 5620de6dab235ca8bd8670d6366c7b9f04f0e3ca9c5e7f87765b38e16ed80c17d7d1630c0d5fd7c5526f070830d94dc74cc2096d8ede87dc7180ed20569509ee
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Feb 9, 2020
…l current tests

1abcecc Tests: Use self.chain instead of 'regtest' in almost all current tests (Jorge Timón)

Pull request description:

  Simply avoiding the hardcoded string in more places for consistency.
  It can also allow for more easily reusing tests for other chains other than regtest.

  Separated from bitcoin#8994 .
  Continues bitcoin#16509 .

  It is still not complete (ie to be complete, we need the -chain parameter in bitcoin#16680 and make whether acceptnonstdtxs is allowed for that chain or not customizable for regtest [or for custom chains like in bitcoin#8994 ] ). But while being incomplete like bitcoin#16509 , it's quite simple to review and another step forward IMO.

ACKs for top commit:
  Sjors:
    re-ACK 1abcecc. I think it's an improvement even if incomplete and if some PR's might accidentally bring "regtest" back. Subsequent improvements hopefully don't have to touch 16 files.
  elichai:
    Code review ACK 1abcecc
  ryanofsky:
    Code review ACK 1abcecc.
  ryanofsky:
    Code review ACK 1abcecc

Tree-SHA512: 5620de6dab235ca8bd8670d6366c7b9f04f0e3ca9c5e7f87765b38e16ed80c17d7d1630c0d5fd7c5526f070830d94dc74cc2096d8ede87dc7180ed20569509ee
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Apr 30, 2020
Summary:
 * Testchains: Generic selection with -chain=<str> in addition of -testnet and -regtest

 * Testchains: Qt: Simplify network/chain styles

This is a backport of Core [[bitcoin/bitcoin#16680 | PR16680]]

Depends on D5887

Test Plan:
  make check

Run bitcoin-qt on win64

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Subscribers: Fabien

Differential Revision: https://reviews.bitcoinabc.org/D5888
sidhujag pushed a commit to syscoin-core/syscoin that referenced this pull request Nov 10, 2020
…l current tests

1abcecc Tests: Use self.chain instead of 'regtest' in almost all current tests (Jorge Timón)

Pull request description:

  Simply avoiding the hardcoded string in more places for consistency.
  It can also allow for more easily reusing tests for other chains other than regtest.

  Separated from bitcoin#8994 .
  Continues bitcoin#16509 .

  It is still not complete (ie to be complete, we need the -chain parameter in bitcoin#16680 and make whether acceptnonstdtxs is allowed for that chain or not customizable for regtest [or for custom chains like in bitcoin#8994 ] ). But while being incomplete like bitcoin#16509 , it's quite simple to review and another step forward IMO.

ACKs for top commit:
  Sjors:
    re-ACK 1abcecc. I think it's an improvement even if incomplete and if some PR's might accidentally bring "regtest" back. Subsequent improvements hopefully don't have to touch 16 files.
  elichai:
    Code review ACK 1abcecc
  ryanofsky:
    Code review ACK 1abcecc.
  ryanofsky:
    Code review ACK 1abcecc

Tree-SHA512: 5620de6dab235ca8bd8670d6366c7b9f04f0e3ca9c5e7f87765b38e16ed80c17d7d1630c0d5fd7c5526f070830d94dc74cc2096d8ede87dc7180ed20569509ee
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants