chore: dashification of descriptor implementation in dash

It removes mentioning of wpkh
dashpay · Mar 6, 2024 · bdbd0b1 · bdbd0b1
1 parent b02fc0b
commit bdbd0b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
@@ -401,7 +401,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider
 /** Base class for all Descriptor implementations. */
 class DescriptorImpl : public Descriptor
 {
-    //! Public key arguments for this descriptor (size 1 for PK, PKH, WPKH; any size for Multisig).
+    //! Public key arguments for this descriptor (size 1 for PK, PKH; any size for Multisig).
     const std::vector<std::unique_ptr<PubkeyProvider>> m_pubkey_args;
     //! The string name of the descriptor function.
     const std::string m_name;
@@ -668,10 +668,10 @@ class ComboDescriptor final : public DescriptorImpl
         out.pubkeys.emplace(id, keys[0]);
         ret.emplace_back(GetScriptForRawPubKey(keys[0])); // P2PK
         if (keys[0].IsCompressed()) {
-            CScript p2wpkh = GetScriptForDestination(PKHash(id));
-            out.scripts.emplace(CScriptID(p2wpkh), p2wpkh);
-            ret.emplace_back(p2wpkh);
-            ret.emplace_back(GetScriptForDestination(ScriptHash(p2wpkh))); // P2SH-P2WPKH
+            CScript p2pkh = GetScriptForDestination(PKHash(id));
+            out.scripts.emplace(CScriptID(p2pkh), p2pkh);
+            ret.emplace_back(p2pkh);
+            ret.emplace_back(GetScriptForDestination(ScriptHash(p2pkh))); // P2SH-P2PKH
         }
         return ret;
     }

diff --git a/test/lint/extended-lint-cppcheck.sh b/test/lint/extended-lint-cppcheck.sh
@@ -39,8 +39,6 @@ IGNORED_WARNINGS=(
     "src/script/descriptor.cpp:.* Class 'PKHDescriptor' has a constructor with 1 argument that is not explicit."
     "src/script/descriptor.cpp:.* Class 'RawDescriptor' has a constructor with 1 argument that is not explicit."
     "src/script/descriptor.cpp:.* Class 'SHDescriptor' has a constructor with 1 argument that is not explicit."
-    "src/script/descriptor.cpp:.* Class 'WPKHDescriptor' has a constructor with 1 argument that is not explicit."
-    "src/script/descriptor.cpp:.* Class 'WSHDescriptor' has a constructor with 1 argument that is not explicit."
     "src/script/script.h:.* Class 'CScript' has a constructor with 1 argument that is not explicit."
     "src/script/standard.h:.* Class 'CScriptID' has a constructor with 1 argument that is not explicit."
     "src/span.h:.* Class 'Span < const CRPCCommand >' has a constructor with 1 argument that is not explicit."