highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
89836a82ee 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 89836a82ee
  theStack:
    ACK 89836a82ee

Tree-SHA512: 36477fdccabe5a8ad91fbabb4655cc363a3a7ca237a98ae6dd4a9fae4a4113762040f864d4ca13a47d081f7d16e5bd487edbfb61ab50a37e4a0424e9bec30b24
This commit is contained in:
MarcoFalke
2020-11-16 07:57:30 +01:00
parent 0ede354367 89836a82ee
commit 2fa085a5d7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/netaddress.h
View File

@@ -29,7 +29,7 @@
* 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`
* or with `SERIALIZE_TRANSACTION_NO_WITNESS`. * or with `SERIALIZE_TRANSACTION_NO_WITNESS`.
*/ */
static const int ADDRV2_FORMAT = 0x20000000; static constexpr int ADDRV2_FORMAT = 0x20000000;
/** /**
* A network type. * A network type.

9
src/test/util/setup_common.h
View File

@@ -11,6 +11,7 @@
#include <node/context.h> #include <node/context.h>
#include <pubkey.h> #include <pubkey.h>
#include <random.h> #include <random.h>
#include <stdexcept>
#include <txmempool.h> #include <txmempool.h>
#include <util/check.h> #include <util/check.h>
#include <util/string.h> #include <util/string.h>
@@ -158,13 +159,15 @@ std::ostream& operator<<(std::ostream& os, const uint256& num);
* Use as * Use as
* BOOST_CHECK_EXCEPTION(code that throws, exception type, HasReason("foo")); * BOOST_CHECK_EXCEPTION(code that throws, exception type, HasReason("foo"));
*/ */
class HasReason { class HasReason
{
public: public:
explicit HasReason(const std::string& reason) : m_reason(reason) {} explicit HasReason(const std::string& reason) : m_reason(reason) {}
template <typename E> bool operator()(const std::exception& e) const
bool operator() (const E& e) const { {
return std::string(e.what()).find(m_reason) != std::string::npos; return std::string(e.what()).find(m_reason) != std::string::npos;
}; };
private: private:
const std::string m_reason; const std::string m_reason;
}; };