From 3a8398024f5df30e6daca8da667f4a6a2dae1279 Mon Sep 17 00:00:00 2001
From: Steven Roose <steven@stevenroose.org>
Date: Thu, 2 May 2019 16:51:55 +0100
Subject: [PATCH] MERGE-FIX: Fix upstream functional tests

---
 src/wallet/rpcdump.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 3bf3514581..d37a2da4b7 100644
--- 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");
             }