From 25eb9f50205b8e391cabbbf721711e08169c3773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= Date: Fri, 23 Mar 2018 00:57:09 +0000 Subject: [PATCH] Inline CKeyStore::AddKey(const CKey &) in CBasicKeyStore --- src/keystore.cpp | 4 ---- src/keystore.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/keystore.cpp b/src/keystore.cpp index fab1b81c9a..dfdfa5ea9f 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -7,10 +7,6 @@ #include -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 ffd3238fd6..2cca42c452 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 GetKeys() const override;