aboutsummaryrefslogtreecommitdiff
path: root/src/rpcdump.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-07-07 10:28:31 +0200
committerWladimir J. van der Laan <[email protected]>2014-07-07 10:29:10 +0200
commit4851d0960313a43b754d8b652ffe194fbb52c597 (patch)
tree92859c1d16409ac6adf8b13140ba3527d27c72c4 /src/rpcdump.cpp
parentMerge pull request #4470 (diff)
parentUse GetBlockTime() more (diff)
downloaddiscoin-4851d0960313a43b754d8b652ffe194fbb52c597.tar.xz
discoin-4851d0960313a43b754d8b652ffe194fbb52c597.zip
Merge pull request #4446
209377a Use GetBlockTime() more (jtimon)
Diffstat (limited to 'src/rpcdump.cpp')
-rw-r--r--src/rpcdump.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp
index 593e0d2b6..d20bfcf09 100644
--- a/src/rpcdump.cpp
+++ b/src/rpcdump.cpp
@@ -157,7 +157,7 @@ Value importwallet(const Array& params, bool fHelp)
if (!file.is_open())
throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
- int64_t nTimeBegin = chainActive.Tip()->nTime;
+ int64_t nTimeBegin = chainActive.Tip()->GetBlockTime();
bool fGood = true;
@@ -215,7 +215,7 @@ Value importwallet(const Array& params, bool fHelp)
pwalletMain->ShowProgress("", 100); // hide progress dialog in GUI
CBlockIndex *pindex = chainActive.Tip();
- while (pindex && pindex->pprev && pindex->nTime > nTimeBegin - 7200)
+ while (pindex && pindex->pprev && pindex->GetBlockTime() > nTimeBegin - 7200)
pindex = pindex->pprev;
if (!pwalletMain->nTimeFirstKey || nTimeBegin < pwalletMain->nTimeFirstKey)
@@ -301,7 +301,7 @@ Value dumpwallet(const Array& params, bool fHelp)
file << strprintf("# Wallet dump created by Bitcoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE);
file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()));
file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString());
- file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->nTime));
+ file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime()));
file << "\n";
for (std::vector<std::pair<int64_t, CKeyID> >::const_iterator it = vKeyBirth.begin(); it != vKeyBirth.end(); it++) {
const CKeyID &keyid = it->second;