aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoão Barbosa <[email protected]>2018-03-23 00:57:09 +0000
committerJoão Barbosa <[email protected]>2018-03-24 12:15:53 +0000
commit25eb9f50205b8e391cabbbf721711e08169c3773 (patch)
treecfc3b6f10e955303fda804aaf8f60f6730d498ed /src
parentMerge #12772: [CI]: bump travis timeout for make check to 50m (diff)
downloaddiscoin-25eb9f50205b8e391cabbbf721711e08169c3773.tar.xz
discoin-25eb9f50205b8e391cabbbf721711e08169c3773.zip
Inline CKeyStore::AddKey(const CKey &) in CBasicKeyStore
Diffstat (limited to 'src')
-rw-r--r--src/keystore.cpp4
-rw-r--r--src/keystore.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/keystore.cpp b/src/keystore.cpp
index fab1b81c9..dfdfa5ea9 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -7,10 +7,6 @@
#include <util.h>
-bool CKeyStore::AddKey(const CKey &key) {
- return AddKeyPubKey(key, key.GetPubKey());
-}
-
void CBasicKeyStore::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)
{
AssertLockHeld(cs_KeyStore);
diff --git a/src/keystore.h b/src/keystore.h
index ffd3238fd..2cca42c45 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -25,7 +25,6 @@ public:
//! Add a key to the store.
virtual bool AddKeyPubKey(const CKey &key, const CPubKey &pubkey) =0;
- virtual bool AddKey(const CKey &key);
//! Check whether a key corresponding to a given address is present in the store.
virtual bool HaveKey(const CKeyID &address) const =0;
@@ -64,6 +63,7 @@ protected:
public:
bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override;
+ bool AddKey(const CKey &key) { return AddKeyPubKey(key, key.GetPubKey()); }
bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
bool HaveKey(const CKeyID &address) const override;
std::set<CKeyID> GetKeys() const override;