Merge pull request #3077 from sipa/chain

Refactor/encapsulate chain globals into a CChain class
This commit is contained in:
Gavin Andresen 2013-10-14 20:39:00 -07:00
commit b9beea6e9d
19 changed files with 217 additions and 213 deletions

View file

@ -540,6 +540,8 @@ void CNode::Cleanup()
void CNode::PushVersion()
{
int nBestHeight = g_signals.GetHeight().get_value_or(0);
/// when NTP implemented, change to just nTime = GetAdjustedTime()
int64 nTime = (fInbound ? GetAdjustedTime() : GetTime());
CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0)));
@ -1482,6 +1484,8 @@ void static StartSync(const vector<CNode*> &vNodes) {
CNode *pnodeNewSync = NULL;
double dBestScore = 0;
int nBestHeight = g_signals.GetHeight().get_value_or(0);
// Iterate over all nodes
BOOST_FOREACH(CNode* pnode, vNodes) {
// check preconditions for allowing a sync