wallet: Replace confusing getAdjustedTime() with GetTime()
This commit is contained in:
4 files changed
+2
-7
No files matched your search
@@ -217,9 +217,6 @@ public:
|
|||||||
//! Check if shutdown requested.
|
//! Check if shutdown requested.
|
||||||
virtual bool shutdownRequested() = 0;
|
virtual bool shutdownRequested() = 0;
|
||||||
|
|
||||||
//! Get adjusted time.
|
|
||||||
virtual int64_t getAdjustedTime() = 0;
|
|
||||||
|
|
||||||
//! Send init message.
|
//! Send init message.
|
||||||
virtual void initMessage(const std::string& message) = 0;
|
virtual void initMessage(const std::string& message) = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -656,7 +656,6 @@ public:
|
|||||||
return chainman().ActiveChainstate().IsInitialBlockDownload();
|
return chainman().ActiveChainstate().IsInitialBlockDownload();
|
||||||
}
|
}
|
||||||
bool shutdownRequested() override { return ShutdownRequested(); }
|
bool shutdownRequested() override { return ShutdownRequested(); }
|
||||||
int64_t getAdjustedTime() override { return GetAdjustedTime(); }
|
|
||||||
void initMessage(const std::string& message) override { ::uiInterface.InitMessage(message); }
|
void initMessage(const std::string& message) override { ::uiInterface.InitMessage(message); }
|
||||||
void initWarning(const bilingual_str& message) override { InitWarning(message); }
|
void initWarning(const bilingual_str& message) override { InitWarning(message); }
|
||||||
void initError(const bilingual_str& message) override { InitError(message); }
|
void initError(const bilingual_str& message) override { InitError(message); }
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ static void WalletTxToJSON(const CWallet& wallet, const CWalletTx& wtx, UniValue
|
|||||||
conflicts.push_back(conflict.GetHex());
|
conflicts.push_back(conflict.GetHex());
|
||||||
entry.pushKV("walletconflicts", conflicts);
|
entry.pushKV("walletconflicts", conflicts);
|
||||||
entry.pushKV("time", wtx.GetTxTime());
|
entry.pushKV("time", wtx.GetTxTime());
|
||||||
entry.pushKV("timereceived", (int64_t)wtx.nTimeReceived);
|
entry.pushKV("timereceived", int64_t{wtx.nTimeReceived});
|
||||||
|
|
||||||
// Add opt-in RBF status
|
// Add opt-in RBF status
|
||||||
std::string rbfStatus = "no";
|
std::string rbfStatus = "no";
|
||||||
|
|||||||
@@ -915,7 +915,7 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const
|
|||||||
bool fInsertedNew = ret.second;
|
bool fInsertedNew = ret.second;
|
||||||
bool fUpdated = update_wtx && update_wtx(wtx, fInsertedNew);
|
bool fUpdated = update_wtx && update_wtx(wtx, fInsertedNew);
|
||||||
if (fInsertedNew) {
|
if (fInsertedNew) {
|
||||||
wtx.nTimeReceived = chain().getAdjustedTime();
|
wtx.nTimeReceived = GetTime();
|
||||||
wtx.nOrderPos = IncOrderPosNext(&batch);
|
wtx.nOrderPos = IncOrderPosNext(&batch);
|
||||||
wtx.m_it_wtxOrdered = wtxOrdered.insert(std::make_pair(wtx.nOrderPos, &wtx));
|
wtx.m_it_wtxOrdered = wtxOrdered.insert(std::make_pair(wtx.nOrderPos, &wtx));
|
||||||
wtx.nTimeSmart = ComputeTimeSmart(wtx, rescanning_old_block);
|
wtx.nTimeSmart = ComputeTimeSmart(wtx, rescanning_old_block);
|
||||||
@@ -1286,7 +1286,6 @@ void CWallet::updatedBlockTip()
|
|||||||
m_best_block_time = GetTime();
|
m_best_block_time = GetTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void CWallet::BlockUntilSyncedToCurrentChain() const {
|
void CWallet::BlockUntilSyncedToCurrentChain() const {
|
||||||
AssertLockNotHeld(cs_wallet);
|
AssertLockNotHeld(cs_wallet);
|
||||||
// Skip the queue-draining stuff if we know we're caught up with
|
// Skip the queue-draining stuff if we know we're caught up with
|
||||||
|
|||||||
Reference in new issue
Block a user