aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp5
-rw-r--r--src/main.cpp14
2 files changed, 1 insertions, 18 deletions
diff --git a/src/init.cpp b/src/init.cpp
index b910c2dd76..d271893644 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -25,7 +25,6 @@ using namespace boost;
CWallet* pwalletMain;
CClientUIInterface uiInterface;
-int64 nTimeNodeStart;
//////////////////////////////////////////////////////////////////////////////
//
@@ -471,10 +470,8 @@ bool AppInit2()
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
printf("Bitcoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
printf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
-
- nTimeNodeStart = GetTime();
if (!fLogTimestamps)
- printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", nTimeNodeStart).c_str());
+ printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
printf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
printf("Used data directory %s\n", pszDataDir);
std::ostringstream strErrors;
diff --git a/src/main.cpp b/src/main.cpp
index 0e22a4c36c..da1072970c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2404,14 +2404,6 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv)
-static bool NodeRecentlyStarted()
-{
- extern int64 nTimeNodeStart;
- int64 timediff = GetTime() - nTimeNodeStart;
-
- return (timediff < (2 * 60 * 60));
-}
-
// The message start string is designed to be unlikely to occur in normal data.
// The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -2518,12 +2510,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
}
}
- // Trigger download of remote node's memory pool
- if (!IsInitialBlockDownload() && !pfrom->fInbound &&
- !pfrom->fClient && NodeRecentlyStarted() &&
- pfrom->nVersion >= MEMPOOL_GD_VERSION)
- pfrom->PushMessage("mempool");
-
// Ask the first connected node for block updates
static int nAskedForBlocks = 0;
if (!pfrom->fClient && !pfrom->fOneShot &&