diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-21 05:04:43 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-26 13:25:21 +0200 |
| commit | af8297c010154243cb11b27184a9badb4e03ecb0 (patch) | |
| tree | 914f153d33ec3b9e9536e841b4881142e15efb51 | |
| parent | 651480c8e453e7df9d735f684e6a3e368c777ac0 (diff) | |
| download | bitcoin-af8297c010154243cb11b27184a9badb4e03ecb0.tar.xz | |
Move functions in wallet.h to implementation file
Breaks compile-time dependency of wallet.h on util.
| -rw-r--r-- | src/wallet.cpp | 17 | ||||
| -rw-r--r-- | src/wallet.h | 18 |
2 files changed, 20 insertions, 15 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 7c04743c0f..ee4793b3f1 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -2168,3 +2168,20 @@ bool CWallet::GetDestData(const CTxDestination &dest, const std::string &key, st } return false; } + +CKeyPool::CKeyPool() +{ + nTime = GetTime(); +} + +CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn) +{ + nTime = GetTime(); + vchPubKey = vchPubKeyIn; +} + +CWalletKey::CWalletKey(int64_t nExpires) +{ + nTimeCreated = (nExpires ? GetTime() : 0); + nTimeExpires = nExpires; +} diff --git a/src/wallet.h b/src/wallet.h index 34c699e979..7cbbb2a6ed 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -61,16 +61,8 @@ public: int64_t nTime; CPubKey vchPubKey; - CKeyPool() - { - nTime = GetTime(); - } - - CKeyPool(const CPubKey& vchPubKeyIn) - { - nTime = GetTime(); - vchPubKey = vchPubKeyIn; - } + CKeyPool(); + CKeyPool(const CPubKey& vchPubKeyIn); IMPLEMENT_SERIALIZE ( @@ -840,11 +832,7 @@ public: //// todo: add something to note what created it (user, getnewaddress, change) //// maybe should have a map<string, string> property map - CWalletKey(int64_t nExpires=0) - { - nTimeCreated = (nExpires ? GetTime() : 0); - nTimeExpires = nExpires; - } + CWalletKey(int64_t nExpires=0); IMPLEMENT_SERIALIZE ( |