diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-12-01 16:32:42 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-01 16:26:11 +0100 |
commit | fa37e798b2660d8e44e31c944a257b55aeef5de2 (patch) | |
tree | 455970a259a24dc9ea06bfa886c8a03c6f7a84cf /src | |
parent | e7507f333bc93047d0baadea4fde19f770dacb56 (diff) |
wallet: Replace confusing getAdjustedTime() with GetTime()
Diffstat (limited to 'src')
-rw-r--r-- | src/interfaces/chain.h | 3 | ||||
-rw-r--r-- | src/node/interfaces.cpp | 1 | ||||
-rw-r--r-- | src/wallet/rpcwallet.cpp | 2 | ||||
-rw-r--r-- | src/wallet/wallet.cpp | 3 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index 38004ce95d..601c677a20 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -217,9 +217,6 @@ public: //! Check if shutdown requested. virtual bool shutdownRequested() = 0; - //! Get adjusted time. - virtual int64_t getAdjustedTime() = 0; - //! Send init message. virtual void initMessage(const std::string& message) = 0; diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp index e5f2753123..075842ef73 100644 --- a/src/node/interfaces.cpp +++ b/src/node/interfaces.cpp @@ -656,7 +656,6 @@ public: return chainman().ActiveChainstate().IsInitialBlockDownload(); } bool shutdownRequested() override { return ShutdownRequested(); } - int64_t getAdjustedTime() override { return GetAdjustedTime(); } void initMessage(const std::string& message) override { ::uiInterface.InitMessage(message); } void initWarning(const bilingual_str& message) override { InitWarning(message); } void initError(const bilingual_str& message) override { InitError(message); } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 22ce271816..391196dec7 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -183,7 +183,7 @@ static void WalletTxToJSON(const CWallet& wallet, const CWalletTx& wtx, UniValue conflicts.push_back(conflict.GetHex()); entry.pushKV("walletconflicts", conflicts); entry.pushKV("time", wtx.GetTxTime()); - entry.pushKV("timereceived", (int64_t)wtx.nTimeReceived); + entry.pushKV("timereceived", int64_t{wtx.nTimeReceived}); // Add opt-in RBF status std::string rbfStatus = "no"; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index e4c3822305..b2051e85cb 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -915,7 +915,7 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const bool fInsertedNew = ret.second; bool fUpdated = update_wtx && update_wtx(wtx, fInsertedNew); if (fInsertedNew) { - wtx.nTimeReceived = chain().getAdjustedTime(); + wtx.nTimeReceived = GetTime(); wtx.nOrderPos = IncOrderPosNext(&batch); wtx.m_it_wtxOrdered = wtxOrdered.insert(std::make_pair(wtx.nOrderPos, &wtx)); wtx.nTimeSmart = ComputeTimeSmart(wtx, rescanning_old_block); @@ -1286,7 +1286,6 @@ void CWallet::updatedBlockTip() m_best_block_time = GetTime(); } - void CWallet::BlockUntilSyncedToCurrentChain() const { AssertLockNotHeld(cs_wallet); // Skip the queue-draining stuff if we know we're caught up with |