commit
a590aae017
5 changed files with 8 additions and 8 deletions
|
@ -23,13 +23,13 @@ private:
|
||||||
// where knowledge about this address first came from
|
// where knowledge about this address first came from
|
||||||
CNetAddr source;
|
CNetAddr source;
|
||||||
|
|
||||||
// last succesfull connection by us
|
// last successful connection by us
|
||||||
int64 nLastSuccess;
|
int64 nLastSuccess;
|
||||||
|
|
||||||
// last try whatsoever by us:
|
// last try whatsoever by us:
|
||||||
// int64 CAddress::nLastTry
|
// int64 CAddress::nLastTry
|
||||||
|
|
||||||
// connection attempts since last succesful attempt
|
// connection attempts since last successful attempt
|
||||||
int nAttempts;
|
int nAttempts;
|
||||||
|
|
||||||
// reference count in new sets (memory only)
|
// reference count in new sets (memory only)
|
||||||
|
|
|
@ -119,7 +119,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decode a base58-encoded string str into byte vector vchRet
|
// Decode a base58-encoded string str into byte vector vchRet
|
||||||
// returns true if decoding is succesful
|
// returns true if decoding is successful
|
||||||
inline bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet)
|
inline bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet)
|
||||||
{
|
{
|
||||||
return DecodeBase58(str.c_str(), vchRet);
|
return DecodeBase58(str.c_str(), vchRet);
|
||||||
|
@ -139,7 +139,7 @@ inline std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decode a base58-encoded string psz that includes a checksum, into byte vector vchRet
|
// Decode a base58-encoded string psz that includes a checksum, into byte vector vchRet
|
||||||
// returns true if decoding is succesful
|
// returns true if decoding is successful
|
||||||
inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet)
|
inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet)
|
||||||
{
|
{
|
||||||
if (!DecodeBase58(psz, vchRet))
|
if (!DecodeBase58(psz, vchRet))
|
||||||
|
@ -160,7 +160,7 @@ inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRe
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decode a base58-encoded string str that includes a checksum, into byte vector vchRet
|
// Decode a base58-encoded string str that includes a checksum, into byte vector vchRet
|
||||||
// returns true if decoding is succesful
|
// returns true if decoding is successful
|
||||||
inline bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet)
|
inline bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet)
|
||||||
{
|
{
|
||||||
return DecodeBase58Check(str.c_str(), vchRet);
|
return DecodeBase58Check(str.c_str(), vchRet);
|
||||||
|
|
|
@ -24,7 +24,7 @@ void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
|
||||||
// --> may result in deadlock between the two threads, depending on when they run.
|
// --> may result in deadlock between the two threads, depending on when they run.
|
||||||
// Solution implemented here:
|
// Solution implemented here:
|
||||||
// Keep track of pairs of locks: (A before B), (A before C), etc.
|
// Keep track of pairs of locks: (A before B), (A before C), etc.
|
||||||
// Complain if any thread trys to lock in a different order.
|
// Complain if any thread tries to lock in a different order.
|
||||||
//
|
//
|
||||||
|
|
||||||
struct CLockLocation
|
struct CLockLocation
|
||||||
|
|
|
@ -1142,7 +1142,7 @@ void ShrinkDebugFile()
|
||||||
// "Never go to sea with two chronometers; take one or three."
|
// "Never go to sea with two chronometers; take one or three."
|
||||||
// Our three time sources are:
|
// Our three time sources are:
|
||||||
// - System clock
|
// - System clock
|
||||||
// - Median of other nodes's clocks
|
// - Median of other nodes clocks
|
||||||
// - The user (asking the user to fix the system clock if the first two disagree)
|
// - The user (asking the user to fix the system clock if the first two disagree)
|
||||||
//
|
//
|
||||||
static int64 nMockTime = 0; // For unit testing
|
static int64 nMockTime = 0; // For unit testing
|
||||||
|
|
|
@ -69,7 +69,7 @@ private:
|
||||||
// the current wallet version: clients below this version are not able to load the wallet
|
// the current wallet version: clients below this version are not able to load the wallet
|
||||||
int nWalletVersion;
|
int nWalletVersion;
|
||||||
|
|
||||||
// the maxmimum wallet format version: memory-only variable that specifies to what version this wallet may be upgraded
|
// the maximum wallet format version: memory-only variable that specifies to what version this wallet may be upgraded
|
||||||
int nWalletMaxVersion;
|
int nWalletMaxVersion;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
Loading…
Reference in a new issue