From c7797ec65544bd23a2e571b2892e1bf512f2a485 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Thu, 6 Jun 2019 16:31:31 +0200 Subject: Remove CKeyStore and squash into CBasicKeyStore --- src/rpc/util.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/rpc/util.cpp') diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 67ccb225b5..65a1b39dd0 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -131,8 +131,8 @@ CPubKey HexToPubKey(const std::string& hex_in) return vchPubKey; } -// Retrieves a public key for an address from the given CKeyStore -CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in) +// Retrieves a public key for an address from the given CBasicKeyStore +CPubKey AddrToPubKey(CBasicKeyStore* const keystore, const std::string& addr_in) { CTxDestination dest = DecodeDestination(addr_in); if (!IsValidDestination(dest)) { @@ -153,7 +153,7 @@ CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in) } // Creates a multisig address from a given list of public keys, number of signatures required, and the address type -CTxDestination AddAndGetMultisigDestination(const int required, const std::vector& pubkeys, OutputType type, CKeyStore& keystore, CScript& script_out) +CTxDestination AddAndGetMultisigDestination(const int required, const std::vector& pubkeys, OutputType type, CBasicKeyStore& keystore, CScript& script_out) { // Gather public keys if (required < 1) { -- cgit v1.2.3