Increase test coverage for addrman and addrinfo

Adds several unittests for CAddrMan and CAddrInfo.
Increases the accuracy of addrman tests.
Removes non-determinism in tests by overriding the random number generator.
Extracts testing code from addrman class to test class.
This commit is contained in:
Ethan Heilman
2015-12-12 22:34:08 -05:00
committed by EthanHeilman
parent 473ad1bb02
commit 40c87b6e69
3 changed files with 391 additions and 49 deletions

View File

@@ -175,9 +175,6 @@ private:
//! critical section to protect the inner data structures
mutable CCriticalSection cs;
//! secret key to randomize bucket select with
uint256 nKey;
//! last used nId
int nIdCount;
@@ -203,6 +200,8 @@ private:
int vvNew[ADDRMAN_NEW_BUCKET_COUNT][ADDRMAN_BUCKET_SIZE];
protected:
//! secret key to randomize bucket select with
uint256 nKey;
//! Find an entry.
CAddrInfo* Find(const CNetAddr& addr, int *pnId = NULL);
@@ -235,6 +234,9 @@ protected:
//! Select an address to connect to, if newOnly is set to true, only the new table is selected from.
CAddrInfo Select_(bool newOnly);
//! Wraps GetRandInt to allow tests to override RandomInt and make it determinismistic.
virtual int RandomInt(int nMax);
#ifdef DEBUG_ADDRMAN
//! Perform consistency check. Returns an error code or zero.
int Check_();
@@ -569,11 +571,6 @@ public:
Check();
}
}
//! Ensure that bucket placement is always the same for testing purposes.
void MakeDeterministic(){
nKey.SetNull(); //Do not use outside of tests.
}
};