Skip to content

V0.11.2.x rename masternodes.dat #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eduffield222 merged 1 commit into from
Mar 6, 2015
Merged

V0.11.2.x rename masternodes.dat #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
14 changes: 7 additions & 7 deletions src/masternodeman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct CompareValueOnly

CMasternodeDB::CMasternodeDB()
{
pathMN = GetDataDir() / "masternodes.dat";
pathMN = GetDataDir() / "mncache.dat";
}

bool CMasternodeDB::Write(const CMasternodeMan& mnodemanToSave)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/masternodeman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/qt/darkcoinstrings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ QT_TRANSLATE_NOOP("darkcoin-core", "List commands"),
QT_TRANSLATE_NOOP("darkcoin-core", "Listen for connections on <port> (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)"),
Expand Down