diff options
author | Harris <brakmic@gmail.com> | 2019-11-24 22:53:42 +0100 |
---|---|---|
committer | Harris <brakmic@gmail.com> | 2019-11-24 22:53:42 +0100 |
commit | 1a3a256d5e0443d19757c1f1fceb9c9ede17758a (patch) | |
tree | 963a9b2827f64f1854a36253f2f1b57e3b23cb13 /src/rpc | |
parent | 239d199667888e5d60309f15a38eed4d3afe56c4 (diff) | |
download | bitcoin-1a3a256d5e0443d19757c1f1fceb9c9ede17758a.tar.xz |
wallet: replace raw pointer with const reference in AddrToPubKey
Diffstat (limited to 'src/rpc')
-rw-r--r-- | src/rpc/util.cpp | 6 | ||||
-rw-r--r-- | src/rpc/util.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index cfa3509c65..0791a365fe 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -131,18 +131,18 @@ CPubKey HexToPubKey(const std::string& hex_in) } // Retrieves a public key for an address from the given FillableSigningProvider -CPubKey AddrToPubKey(FillableSigningProvider* const keystore, const std::string& addr_in) +CPubKey AddrToPubKey(const FillableSigningProvider& keystore, const std::string& addr_in) { CTxDestination dest = DecodeDestination(addr_in); if (!IsValidDestination(dest)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address: " + addr_in); } - CKeyID key = GetKeyForDestination(*keystore, dest); + CKeyID key = GetKeyForDestination(keystore, dest); if (key.IsNull()) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("%s does not refer to a key", addr_in)); } CPubKey vchPubKey; - if (!keystore->GetPubKey(key, vchPubKey)) { + if (!keystore.GetPubKey(key, vchPubKey)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("no full public key for address %s", addr_in)); } if (!vchPubKey.IsFullyValid()) { diff --git a/src/rpc/util.h b/src/rpc/util.h index 221638aa9e..9304e1fefb 100644 --- a/src/rpc/util.h +++ b/src/rpc/util.h @@ -69,7 +69,7 @@ extern std::string HelpExampleCli(const std::string& methodname, const std::stri extern std::string HelpExampleRpc(const std::string& methodname, const std::string& args); CPubKey HexToPubKey(const std::string& hex_in); -CPubKey AddrToPubKey(FillableSigningProvider* const keystore, const std::string& addr_in); +CPubKey AddrToPubKey(const FillableSigningProvider& keystore, const std::string& addr_in); CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, FillableSigningProvider& keystore, CScript& script_out); UniValue DescribeAddress(const CTxDestination& dest); |