MERGE-FIX: Fix upstream functional tests

kallewoof · May 3, 2019 · 3a83980 · 3a83980
1 parent 71723f7
commit 3a83980
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -965,7 +965,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
         }
 
         // (P2SH-)P2PK/P2PKH/P2WPKH
-        if (dest.type() == typeid(CKeyID) || dest.type() == typeid(WitnessV0KeyHash)) {
+        if (dest.type() == typeid(PKHash) || dest.type() == typeid(WitnessV0KeyHash)) {
             if (!allow_p2wpkh && dest.type() == typeid(WitnessV0KeyHash)) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "P2WPKH cannot be embedded in P2WSH");
             }