From f32c1e07fd6c174ff3f6406a619550d2f6c19360 Mon Sep 17 00:00:00 2001 From: Ben Woosley Date: Wed, 15 Jan 2020 13:41:25 -0800 Subject: Use explicit conversion from WitnessV0KeyHash -> CKeyID These types are equivalent, in data etc, so they need only their data cast across. --- src/script/signingprovider.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/script/signingprovider.cpp') diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp index a4eb0a839..2d8dc7d47 100644 --- a/src/script/signingprovider.cpp +++ b/src/script/signingprovider.cpp @@ -183,7 +183,7 @@ CKeyID GetKeyForDestination(const SigningProvider& store, const CTxDestination& return ToKeyID(*id); } if (auto witness_id = boost::get(&dest)) { - return CKeyID(*witness_id); + return ToKeyID(*witness_id); } if (auto script_hash = boost::get(&dest)) { CScript script; @@ -191,7 +191,7 @@ CKeyID GetKeyForDestination(const SigningProvider& store, const CTxDestination& CTxDestination inner_dest; if (store.GetCScript(script_id, script) && ExtractDestination(script, inner_dest)) { if (auto inner_witness_id = boost::get(&inner_dest)) { - return CKeyID(*inner_witness_id); + return ToKeyID(*inner_witness_id); } } } -- cgit v1.2.3