foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-12 11:19:08 -05:00
Code Issues Activity

[addrman] Improve variable naming/code style of touched code.

Browse source
This commit is contained in:
John Newbery 2020-12-03 11:31:08 +00:00
parent b4c5fda417
commit 009b8e0fdf
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/addrman.h
View file

@ -504,14 +504,14 @@ public:
// so we store all bucket-entry_index pairs to iterate through later. // so we store all bucket-entry_index pairs to iterate through later.
std::vector<std::pair<int, int>> bucket_entries; std::vector<std::pair<int, int>> bucket_entries;
for (int bucket = 0; bucket < nUBuckets; bucket++) { for (int bucket = 0; bucket < nUBuckets; ++bucket) {
int nSize = 0; int num_entries{0};
s >> nSize; s >> num_entries;
for (int n = 0; n < nSize; n++) { for (int n = 0; n < num_entries; ++n) {
int nIndex = 0; int entry_index{0};
s >> nIndex; s >> entry_index;
if (nIndex >= 0 && nIndex < nNew) { if (entry_index >= 0 && entry_index < nNew) {
bucket_entries.emplace_back(bucket, nIndex); bucket_entries.emplace_back(bucket, entry_index);
} }
} }
} }
@ -527,13 +527,13 @@ public:
for (auto bucket_entry : bucket_entries) { for (auto bucket_entry : bucket_entries) {
int bucket{bucket_entry.first}; int bucket{bucket_entry.first};
const int n{bucket_entry.second}; const int entry_index{bucket_entry.second};
CAddrInfo& info = mapInfo[n]; CAddrInfo& info = mapInfo[entry_index];
int nUBucketPos = info.GetBucketPosition(nKey, true, bucket); int nUBucketPos = info.GetBucketPosition(nKey, true, bucket);
if (format >= Format::V2_ASMAP && nUBuckets == ADDRMAN_NEW_BUCKET_COUNT && vvNew[bucket][nUBucketPos] == -1 && if (format >= Format::V2_ASMAP && nUBuckets == ADDRMAN_NEW_BUCKET_COUNT && vvNew[bucket][nUBucketPos] == -1 &&
info.nRefCount < ADDRMAN_NEW_BUCKETS_PER_ADDRESS && serialized_asmap_version == supplied_asmap_version) { info.nRefCount < ADDRMAN_NEW_BUCKETS_PER_ADDRESS && serialized_asmap_version == supplied_asmap_version) {
// Bucketing has not changed, using existing bucket positions for the new table // Bucketing has not changed, using existing bucket positions for the new table
vvNew[bucket][nUBucketPos] = n; vvNew[bucket][nUBucketPos] = entry_index;
info.nRefCount++; info.nRefCount++;
} else { } else {
// In case the new table data cannot be used (format unknown, bucket count wrong or new asmap), // In case the new table data cannot be used (format unknown, bucket count wrong or new asmap),
@ -542,7 +542,7 @@ public:
bucket = info.GetNewBucket(nKey, m_asmap); bucket = info.GetNewBucket(nKey, m_asmap);
nUBucketPos = info.GetBucketPosition(nKey, true, bucket); nUBucketPos = info.GetBucketPosition(nKey, true, bucket);
if (vvNew[bucket][nUBucketPos] == -1) { if (vvNew[bucket][nUBucketPos] == -1) {
vvNew[bucket][nUBucketPos] = n; vvNew[bucket][nUBucketPos] = entry_index;
info.nRefCount++; info.nRefCount++;
} }
} }