diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-09-09 07:48:10 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2017-02-27 20:45:17 +0000 |
| commit | 2e518e313b5d5320c16bdb33ebd008b6d30a90f2 (patch) | |
| tree | 12fc602f93dea67cb3fabef7c9bbf2908e4887da /src/rpc | |
| parent | d77ad6d41666b4c41abe1ba3b63300df1903643e (diff) | |
| download | bitcoin-2e518e313b5d5320c16bdb33ebd008b6d30a90f2.tar.xz | |
Move nWalletUnlockTime to CWallet::nRelockTime, and name timed task unique per CWallet
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/misc.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/server.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index c9bbce856d..746189a2ae 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -102,7 +102,7 @@ UniValue getinfo(const JSONRPCRequest& request) obj.push_back(Pair("keypoolsize", (int)pwallet->GetKeyPoolSize())); } if (pwallet && pwallet->IsCrypted()) - obj.push_back(Pair("unlocked_until", nWalletUnlockTime)); + obj.push_back(Pair("unlocked_until", pwallet->nRelockTime)); obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK()))); #endif obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()))); diff --git a/src/rpc/server.h b/src/rpc/server.h index b8f0373acc..72ffc76520 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -190,7 +190,6 @@ extern uint256 ParseHashO(const UniValue& o, std::string strKey); extern std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName); extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey); -extern int64_t nWalletUnlockTime; extern CAmount AmountFromValue(const UniValue& value); extern UniValue ValueFromAmount(const CAmount& amount); extern double GetDifficulty(const CBlockIndex* blockindex = NULL); |