Browse Source

Move functions in wallet.h to implementation file

Breaks compile-time dependency of wallet.h on util.
pull/1/head
Wladimir J. van der Laan 8 years ago
parent
commit
af8297c010
  1. 17
      src/wallet.cpp
  2. 18
      src/wallet.h

17
src/wallet.cpp

@ -2168,3 +2168,20 @@ bool CWallet::GetDestData(const CTxDestination &dest, const std::string &key, st @@ -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;
}

18
src/wallet.h

@ -61,16 +61,8 @@ public: @@ -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: @@ -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
(

Loading…
Cancel
Save