BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move functions in wallet.h to implementation file 

Breaks compile-time dependency of wallet.h on util.
This commit is contained in:
Wladimir J. van der Laan 2014-08-21 05:04:43 +02:00
parent 651480c8e4
commit af8297c010
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wallet.cpp
View File

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

@ -61,16 +61,8 @@ public:
int64_t nTime; int64_t nTime;
CPubKey vchPubKey; CPubKey vchPubKey;
CKeyPool() CKeyPool();
{ CKeyPool(const CPubKey& vchPubKeyIn);
nTime = GetTime();
}
CKeyPool(const CPubKey& vchPubKeyIn)
{
nTime = GetTime();
vchPubKey = vchPubKeyIn;
}
IMPLEMENT_SERIALIZE IMPLEMENT_SERIALIZE
( (
@ -840,11 +832,7 @@ public:
//// todo: add something to note what created it (user, getnewaddress, change) //// todo: add something to note what created it (user, getnewaddress, change)
//// maybe should have a map<string, string> property map //// maybe should have a map<string, string> property map
CWalletKey(int64_t nExpires=0) CWalletKey(int64_t nExpires=0);
{
nTimeCreated = (nExpires ? GetTime() : 0);
nTimeExpires = nExpires;
}
IMPLEMENT_SERIALIZE IMPLEMENT_SERIALIZE
( (