Merge #20033: refactor: minor whitespace fixups, s/const/constexpr/ and remove template (followup to #19845)

89836a82eec63f93bbe6c3bd6a52be26e71ab54d style: minor improvements as a followup to #19845 (Vasil Dimov)

Pull request description:

  Address suggestions:
  https://github.com/bitcoin/bitcoin/pull/19845#discussion_r495486760
  https://github.com/bitcoin/bitcoin/pull/19845#discussion_r495488051
  https://github.com/bitcoin/bitcoin/pull/19845#discussion_r495730125

ACKs for top commit:
  jonatack:
    re-ACK 89836a8 change since previous review is replacing std::runtime_error with std::exception, built/ran unit tests with gcc debian 10.2.0-15, then broke a few v3 net_tests involving `BOOST_CHECK_EXCEPTION`, rebuilt, ran `src/test/test_bitcoin -t net_tests -l all` and checked the error reporting.
  hebasto:
    re-ACK 89836a82eec63f93bbe6c3bd6a52be26e71ab54d
  theStack:
    ACK 89836a82eec63f93bbe6c3bd6a52be26e71ab54d

Tree-SHA512: 36477fdccabe5a8ad91fbabb4655cc363a3a7ca237a98ae6dd4a9fae4a4113762040f864d4ca13a47d081f7d16e5bd487edbfb61ab50a37e4a0424e9bec30b24
This commit is contained in:
MarcoFalke 2020-11-16 07:57:30 +01:00 committed by Vijay Das Manikpuri
parent f87b37e07b
commit fce00a8118
No known key found for this signature in database
GPG Key ID: DB1D81B01DB7C46E

View File

@ -30,7 +30,7 @@ extern bool fAllowPrivateNet;
* should be serialized in (unserialized from) v2 format (BIP155). * should be serialized in (unserialized from) v2 format (BIP155).
* Make sure that this does not collide with any of the values in `version.h` * Make sure that this does not collide with any of the values in `version.h`
*/ */
static const int ADDRV2_FORMAT = 0x20000000; static constexpr int ADDRV2_FORMAT = 0x20000000;
/** /**
* A network type. * A network type.