From f381299d64784c60cda30be48ea30a6469f05d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= Date: Fri, 23 Mar 2018 00:57:33 +0000 Subject: [PATCH] Move CKeyStore::cs_KeyStore to CBasicKeyStore --- doc/developer-notes.md | 2 +- src/keystore.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 8f06ee4ecac..ecc99367416 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 2cca42c452f..38d02fb3600 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 WatchOnlySet; class CBasicKeyStore : public CKeyStore { protected: + mutable CCriticalSection cs_KeyStore; + KeyMap mapKeys; WatchKeyMap mapWatchKeys; ScriptMap mapScripts;