highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-18 12:53:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#23492: test: tidy up addrman unit tests

Browse Source 
0000edaba306487a750f5648438f3dc8de08127c style: Use 4 spaces for indentation, not 5 (MarcoFalke)
fab9264be50955224b06868759d37547cabe48a4 test: Remove unused CDataStream copy (MarcoFalke)

Pull request description:

  Fix two issues:

  * Remove unneeded code, which makes test harder to read and write
  * Fix wrong indentation, which breaks some editors

ACKs for top commit:
  jnewbery:
    Code review ACK 0000edaba306487a750f5648438f3dc8de08127c
  brunoerg:
    cr/tACK 0000edaba306487a750f5648438f3dc8de08127c
  shaavan:
    ACK 0000edaba306487a750f5648438f3dc8de08127c

Tree-SHA512: babec1dfb840bd11ec89ec3d0e2529f826f5775fc7625e987480fac5251f6a6cdcf9a1051c8364d6ca2f66ce9934dcb8447a8cf7376b3952920faf2afd02be99
This commit is contained in:
MarcoFalke 2021-11-12 16:06:15 +01:00
commit c9dd5c8d6e
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/addrman_tests.cpp
View File

@ -90,7 +90,8 @@ static CService ResolveService(const std::string& ip, uint16_t port = 0)
} }
static std::vector<bool> FromBytes(const unsigned char* source, int vector_size) { static std::vector<bool> FromBytes(const unsigned char* source, int vector_size)
{
std::vector<bool> result(vector_size); std::vector<bool> result(vector_size);
for (int byte_i = 0; byte_i < vector_size / 8; ++byte_i) { for (int byte_i = 0; byte_i < vector_size / 8; ++byte_i) {
unsigned char cur_byte = source[byte_i]; unsigned char cur_byte = source[byte_i];
@ -693,7 +694,6 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
// Test: IP addresses in the different source /16 prefixes sometimes map to NO MORE // Test: IP addresses in the different source /16 prefixes sometimes map to NO MORE
// than 1 bucket. // than 1 bucket.
BOOST_CHECK(buckets.size() == 1); BOOST_CHECK(buckets.size() == 1);
} }
BOOST_AUTO_TEST_CASE(addrman_serialization) BOOST_AUTO_TEST_CASE(addrman_serialization)
@ -831,7 +831,6 @@ BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
BOOST_CHECK(addrman.size() == 22); BOOST_CHECK(addrman.size() == 22);
BOOST_CHECK(addrman.SelectTriedCollision().first.ToString() == "[::]:0"); BOOST_CHECK(addrman.SelectTriedCollision().first.ToString() == "[::]:0");
} }
} }
BOOST_AUTO_TEST_CASE(addrman_noevict) BOOST_AUTO_TEST_CASE(addrman_noevict)
@ -949,9 +948,7 @@ static CDataStream AddrmanToStream(const AddrMan& addrman)
CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION); CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION);
ssPeersIn << Params().MessageStart(); ssPeersIn << Params().MessageStart();
ssPeersIn << addrman; ssPeersIn << addrman;
std::string str = ssPeersIn.str(); return ssPeersIn;
std::vector<unsigned char> vchData(str.begin(), str.end());
return CDataStream(vchData, SER_DISK, CLIENT_VERSION);
} }
BOOST_AUTO_TEST_CASE(load_addrman) BOOST_AUTO_TEST_CASE(load_addrman)
@ -1023,9 +1020,7 @@ static CDataStream MakeCorruptPeersDat()
AddrInfo info = AddrInfo(addr, resolved); AddrInfo info = AddrInfo(addr, resolved);
s << info; s << info;
std::string str = s.str(); return s;
std::vector<unsigned char> vchData(str.begin(), str.end());
return CDataStream(vchData, SER_DISK, CLIENT_VERSION);
} }
BOOST_AUTO_TEST_CASE(load_addrman_corrupted) BOOST_AUTO_TEST_CASE(load_addrman_corrupted)