From e522cbfd6ad286d4a6cfaa670b12e498eea50c1d Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 5 Mar 2015 20:39:47 +0300 Subject: [PATCH] rename masternodes.dat->mncache.dat / fix strings --- src/init.cpp | 6 +++--- src/masternodeman.cpp | 14 +++++++------- src/masternodeman.h | 2 +- src/qt/darkcoinstrings.cpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 13d9e9a62e9a..f8bf4113b825 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1152,14 +1152,14 @@ bool AppInit2(boost::thread_group& threadGroup) //CAddress addr; //ConnectNode(addr, strNode.c_str(), true); - uiInterface.InitMessage(_("Loading masternode list...")); + uiInterface.InitMessage(_("Loading masternode cache...")); CMasternodeDB mndb; CMasternodeDB::ReadResult readResult = mndb.Read(mnodeman); if (readResult == CMasternodeDB::FileError) - LogPrintf("Missing masternode list file - masternodes.dat, will try to recreate\n"); + LogPrintf("Missing masternode cache file - mncache.dat, will try to recreate\n"); else if (readResult != CMasternodeDB::Ok) - LogPrintf("Masternode list file masternodes.dat has invalid format\n"); + LogPrintf("Masternode cache file mncache.dat has invalid format\n"); fMasterNode = GetBoolArg("-masternode", false); if(fMasterNode) { diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 26da864c3652..c83f83b33588 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -30,7 +30,7 @@ struct CompareValueOnly CMasternodeDB::CMasternodeDB() { - pathMN = GetDataDir() / "masternodes.dat"; + pathMN = GetDataDir() / "mncache.dat"; } bool CMasternodeDB::Write(const CMasternodeMan& mnodemanToSave) @@ -60,7 +60,7 @@ bool CMasternodeDB::Write(const CMasternodeMan& mnodemanToSave) FileCommit(fileout); fileout.fclose(); - LogPrintf("Written info to masternodes.dat %dms\n", GetTimeMillis() - nStart); + LogPrintf("Written info to mncache.dat %dms\n", GetTimeMillis() - nStart); LogPrintf(" %s\n", mnodemanToSave.ToString()); return true; @@ -131,7 +131,7 @@ CMasternodeDB::ReadResult CMasternodeDB::Read(CMasternodeMan& mnodemanToLoad) } mnodemanToLoad.CheckAndRemove(); // clean out expired - LogPrintf("Loaded info from masternodes.dat %dms\n", GetTimeMillis() - nStart); + LogPrintf("Loaded info from mncache.dat %dms\n", GetTimeMillis() - nStart); LogPrintf(" %s\n", mnodemanToLoad.ToString()); return Ok; @@ -144,17 +144,17 @@ void DumpMasternodes() CMasternodeDB mndb; CMasternodeMan tempMnodeman; - LogPrintf("Verifying masternodes.dat format...\n"); + LogPrintf("Verifying mncache.dat format...\n"); CMasternodeDB::ReadResult readResult = mndb.Read(tempMnodeman); // there was an error and it was not an error on file openning => do not proceed if (readResult == CMasternodeDB::FileError) - LogPrintf("Missing masternode list file - masternodes.dat, will try to recreate\n"); + LogPrintf("Missing masternode cache file - mncache.dat, will try to recreate\n"); else if (readResult != CMasternodeDB::Ok) { - LogPrintf("Masternode list file masternodes.dat has invalid format\n"); + LogPrintf("Masternode cache file mncache.dat has invalid format\n"); return; } - LogPrintf("Writting info to masternodes.dat...\n"); + LogPrintf("Writting info to mncache.dat...\n"); mndb.Write(mnodeman); LogPrintf("Masternode dump finished %dms\n", GetTimeMillis() - nStart); diff --git a/src/masternodeman.h b/src/masternodeman.h index 9643d37768f6..ea3430cdc818 100644 --- a/src/masternodeman.h +++ b/src/masternodeman.h @@ -26,7 +26,7 @@ class CMasternodeMan; extern CMasternodeMan mnodeman; void DumpMasternodes(); -/** Access to the MN database (masternodes.dat) +/** Access to the MN database (mncache.dat) */ class CMasternodeDB { diff --git a/src/qt/darkcoinstrings.cpp b/src/qt/darkcoinstrings.cpp index d765ff585ac3..52c953b765e8 100644 --- a/src/qt/darkcoinstrings.cpp +++ b/src/qt/darkcoinstrings.cpp @@ -276,7 +276,7 @@ QT_TRANSLATE_NOOP("darkcoin-core", "List commands"), QT_TRANSLATE_NOOP("darkcoin-core", "Listen for connections on (default: 9999 or testnet: 19999)"), QT_TRANSLATE_NOOP("darkcoin-core", "Loading addresses..."), QT_TRANSLATE_NOOP("darkcoin-core", "Loading block index..."), -QT_TRANSLATE_NOOP("darkcoin-core", "Loading masternode list..."), +QT_TRANSLATE_NOOP("darkcoin-core", "Loading masternode cache..."), QT_TRANSLATE_NOOP("darkcoin-core", "Loading wallet... (%3.2f %%)"), QT_TRANSLATE_NOOP("darkcoin-core", "Loading wallet..."), QT_TRANSLATE_NOOP("darkcoin-core", "Log transaction priority and fee per kB when mining blocks (default: 0)"),