diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2019-06-06 22:52:24 +0200 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2019-07-09 16:20:18 -0400 |
| commit | 37a79a4fccbf6cd65a933594e24e59d36e674653 (patch) | |
| tree | 3ef48673c8380a9c7a18cd2e790512177384ca54 /src/wallet | |
| parent | 16f8096e911e4d59292240a17e2d4004f0500b9e (diff) | |
| download | bitcoin-37a79a4fccbf6cd65a933594e24e59d36e674653.tar.xz | |
Move various SigningProviders to signingprovider.{cpp,h}
Moves all of the various SigningProviders out of sign.{cpp,h} and
keystore.{cpp,h}. As such, keystore.{cpp,h} is also removed.
Includes and the Makefile are updated to reflect this. Includes were largely
changed using:
git grep -l "keystore.h" | xargs sed -i -e 's;keystore.h;script/signingprovider.h;g'
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/crypter.h | 4 | ||||
| -rw-r--r-- | src/wallet/ismine.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index 95235903f4..4cc40a8c6f 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -5,12 +5,14 @@ #ifndef BITCOIN_WALLET_CRYPTER_H #define BITCOIN_WALLET_CRYPTER_H -#include <keystore.h> #include <serialize.h> #include <support/allocators/secure.h> +#include <script/signingprovider.h> #include <atomic> +#include <boost/signals2/signal.hpp> + const unsigned int WALLET_CRYPTO_KEY_SIZE = 32; const unsigned int WALLET_CRYPTO_SALT_SIZE = 8; const unsigned int WALLET_CRYPTO_IV_SIZE = 16; diff --git a/src/wallet/ismine.cpp b/src/wallet/ismine.cpp index 6138d4ae44..b7ef2d4490 100644 --- a/src/wallet/ismine.cpp +++ b/src/wallet/ismine.cpp @@ -8,6 +8,7 @@ #include <key.h> #include <script/script.h> #include <script/sign.h> +#include <script/signingprovider.h> #include <wallet/wallet.h> typedef std::vector<unsigned char> valtype; diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 8807acb6b7..054123880b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -13,13 +13,13 @@ #include <interfaces/wallet.h> #include <key.h> #include <key_io.h> -#include <keystore.h> #include <policy/fees.h> #include <policy/policy.h> #include <primitives/block.h> #include <primitives/transaction.h> #include <script/descriptor.h> #include <script/script.h> +#include <script/signingprovider.h> #include <util/bip32.h> #include <util/error.h> #include <util/fees.h> |