mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-21 14:34:49 +01:00
Code Issues Projects Releases Wiki Activity

style: minor improvements as a followup to #19845

Browse source 
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
This commit is contained in:
Vasil Dimov 2020-09-29 12:13:10 +02:00
parent ec9b4492eb
commit 89836a82ee
No known key found for this signature in database
GPG key ID: 54DF06F64B55CBBF
2 changed files with 7 additions and 4 deletions
Show stats 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`
* or with `SERIALIZE_TRANSACTION_NO_WITNESS`.
*/
static const int ADDRV2_FORMAT = 0x20000000;
static constexpr int ADDRV2_FORMAT = 0x20000000;
/**
* A network type.

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

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