aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoão Barbosa <joao.paulo.barbosa@gmail.com>2018-03-23 00:57:33 +0000
committerJoão Barbosa <joao.paulo.barbosa@gmail.com>2018-03-24 12:15:53 +0000
commitf381299d64784c60cda30be48ea30a6469f05d35 (patch)
treece8224a0c328e5599692f1d74918e1ad0aba2612
parent25eb9f50205b8e391cabbbf721711e08169c3773 (diff)
Move CKeyStore::cs_KeyStore to CBasicKeyStore
-rw-r--r--doc/developer-notes.md2
-rw-r--r--src/keystore.h5
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 8f06ee4eca..ecc9936741 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -218,7 +218,7 @@ inconsistencies reported in the debug.log file.
Re-architecting the core code so there are better-defined interfaces
between the various components is a goal, with any necessary locking
-done by the components (e.g. see the self-contained CKeyStore class
+done by the components (e.g. see the self-contained CBasicKeyStore class
and its cs_KeyStore lock for example).
Threads
diff --git a/src/keystore.h b/src/keystore.h
index 2cca42c452..38d02fb360 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -17,9 +17,6 @@
/** A virtual base class for key stores */
class CKeyStore
{
-protected:
- mutable CCriticalSection cs_KeyStore;
-
public:
virtual ~CKeyStore() {}
@@ -54,6 +51,8 @@ typedef std::set<CScript> WatchOnlySet;
class CBasicKeyStore : public CKeyStore
{
protected:
+ mutable CCriticalSection cs_KeyStore;
+
KeyMap mapKeys;
WatchKeyMap mapWatchKeys;
ScriptMap mapScripts;