Merge dashpay#6790: test: follow-up dashpay#6762 and dashpay#6763 to remove workaround and fix error message

4dca765 test: follow-up dashpay#6762 - removed related TODO from functional test (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  Once both dashpay#6762 and dashpay#6763 are merged, no more need to have a workaround with manual lock / unlock of descriptor wallet before `upgradetohd`.
  I fixes CI failure on develop also due to conflict.

  ## What was done?
  Removed this workaround from `wallet_upgradetohd.py`

  ## How Has This Been Tested?
  See CI

  ## Breaking Changes
  N/A

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone

ACKs for top commit:
  DashCoreAutoGuix:
    utACK 4dca765 (used wrong account, disregard)
  PastaPastaPasta:
    utACK 4dca765
  kwvg:
    utACK 4dca765

Tree-SHA512: 435359f53f42c29f3e6885ab6fbeabd1a31135fe67a15b894e6f4a92a0aced3e96e0f1bb38598eb74eb251df1f6ae603e033ee41e3bf500bcc4d6c5c1031b800

Author: PastaPastaPasta

test/functional/wallet_upgradetohd.py

@@ -206,14 +206,8 @@ def run_test(self):
         if not self.options.descriptors:
             assert_raises_rpc_error(-1,  "Error: The wallet passphrase entered was incorrect", node.upgradetohd, mnemonic, "", "wrongpass")
         else:
-            assert_raises_rpc_error(-1,  "SetupDescriptorScriptPubKeyMans: Wallet is locked, cannot setup new descriptors", node.upgradetohd, mnemonic, "", "wrongpass")
-        if self.options.descriptors:
-            # TODO - implement auto-unlock descriptor wallet
-            node.walletpassphrase(walletpass, 100)
+            assert_raises_rpc_error(-4,  "Error: The wallet passphrase entered was incorrect", node.upgradetohd, mnemonic, "", "wrongpass")
         assert node.upgradetohd(mnemonic, "", walletpass)
-        # TODO - drop it too!
-        if self.options.descriptors:
-            node.walletlock()
         if not self.options.descriptors:
             assert_raises_rpc_error(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.", node.dumphdinfo)
         else: