Mercurial > hg > bitcoin

changeset 1287:712a725f2b3e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clarify function signature (GetNumBlocksOfPeers) and use number of 'frozen' blocks as initial value for number of peer blocks
author Wladimir J. van der Laan <laanwj@gmail.com>
date Sun, 11 Sep 2011 10:49:30 +0200
parents a43fe0bbf87f
children 5ef6761a6c89 116598f4cea5
files src/main.cpp src/main.h src/qt/bitcoingui.cpp src/qt/clientmodel.cpp src/qt/clientmodel.h
diffstat 5 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,8 +31,8 @@
 uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
 static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
 const int nTotalBlocksEstimate = 140700; // Conservative estimate of total nr of blocks on main chain
-int nMaxBlocksOfOtherNodes = 0; // Maximum amount of blocks that other nodes claim to have
 const int nInitialBlockThreshold = 120; // Regard blocks up until N-threshold as "initial download"
+int nMaxBlocksOfPeers = 0; // Amount of blocks that other nodes claim to have
 CBlockIndex* pindexGenesisBlock = NULL;
 int nBestHeight = -1;
 CBigNum bnBestChainWork = 0;
@@ -728,9 +728,9 @@
 }
 
 // Return maximum amount of blocks that other nodes claim to have
-int GetMaxBlocksOfOtherNodes()
+int GetNumBlocksOfPeers()
 {
-    return nMaxBlocksOfOtherNodes;
+    return std::max(nMaxBlocksOfPeers, GetTotalBlocksEstimate());
 }
 
 bool IsInitialBlockDownload()
@@ -1846,9 +1846,9 @@
         pfrom->fSuccessfullyConnected = true;
 
         printf("version message: version %d, blocks=%d\n", pfrom->nVersion, pfrom->nStartingHeight);
-        if(pfrom->nStartingHeight > nMaxBlocksOfOtherNodes)
+        if(pfrom->nStartingHeight > nMaxBlocksOfPeers)
         {
-            nMaxBlocksOfOtherNodes = pfrom->nStartingHeight;
+            nMaxBlocksOfPeers = pfrom->nStartingHeight;
         }
     }
 
--- a/src/main.h
+++ b/src/main.h
@@ -99,7 +99,7 @@
 bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
 bool CheckProofOfWork(uint256 hash, unsigned int nBits);
 int GetTotalBlocksEstimate();
-int GetMaxBlocksOfOtherNodes();
+int GetNumBlocksOfPeers();
 bool IsInitialBlockDownload();
 std::string GetWarnings(std::string strFor);
 
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -346,7 +346,7 @@
 void BitcoinGUI::setNumBlocks(int count)
 {
     int initTotal = clientModel->getNumBlocksAtStartup();
-    int total = clientModel->getTotalBlocksEstimate();
+    int total = clientModel->getNumBlocksOfPeers();
     QString tooltip;
 
     if(count < total)
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -67,9 +67,9 @@
     return IsInitialBlockDownload();
 }
 
-int ClientModel::getTotalBlocksEstimate() const
+int ClientModel::getNumBlocksOfPeers() const
 {
-    return GetMaxBlocksOfOtherNodes();
+    return GetNumBlocksOfPeers();
 }
 
 OptionsModel *ClientModel::getOptionsModel()
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -32,7 +32,7 @@
     // Return true if core is doing initial block download
     bool inInitialBlockDownload() const;
     // Return conservative estimate of total number of blocks, or 0 if unknown
-    int getTotalBlocksEstimate() const;
+    int getNumBlocksOfPeers() const;
 
     QString formatFullVersion() const;