wallet: Delete LegacySPKM

Deletes LegacyScriptPubKeyMan and related tests Best reviewed with `git diff --patience` or `git diff --histogram`
2026-06-08 21:59:10 +02:00 · 2024-01-05 18:42:23 -05:00
parent 8ede6dea0c
commit 83af1a3cca
22 changed files with 25 additions and 2427 deletions
--- a/src/wallet/test/ismine_tests.cpp
+++ b/src/wallet/test/ismine_tests.cpp
@@ -36,25 +36,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
    CScript scriptPubKey;
    isminetype result;

-    // P2PK compressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForRawPubKey(pubkeys[0]);
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2PK compressed - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -67,25 +48,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2PK uncompressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForRawPubKey(uncompressedPubkey);
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2PK uncompressed - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -98,25 +60,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2PKH compressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForDestination(PKHash(pubkeys[0]));
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2PKH compressed - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -129,25 +72,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2PKH uncompressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForDestination(PKHash(uncompressedPubkey));
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2PKH uncompressed - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -160,33 +84,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2SH - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript redeemScript = GetScriptForDestination(PKHash(pubkeys[0]));
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemScript));
-
-        // Keystore does not have redeemScript or key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has redeemScript but no key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has redeemScript and key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2SH - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -200,25 +97,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // (P2PKH inside) P2SH inside P2SH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript redeemscript_inner = GetScriptForDestination(PKHash(pubkeys[0]));
-        CScript redeemscript = GetScriptForDestination(ScriptHash(redeemscript_inner));
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemscript_inner));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
    // (P2PKH inside) P2SH inside P2SH (invalid) - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -228,25 +106,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(spk_manager, nullptr);
    }

-    // (P2PKH inside) P2SH inside P2WSH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript redeemscript = GetScriptForDestination(PKHash(pubkeys[0]));
-        CScript witnessscript = GetScriptForDestination(ScriptHash(redeemscript));
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
    // (P2PKH inside) P2SH inside P2WSH (invalid) - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -256,23 +115,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(spk_manager, nullptr);
    }

-    // P2WPKH inside P2WSH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript witnessscript = GetScriptForDestination(WitnessV0KeyHash(pubkeys[0]));
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
    // P2WPKH inside P2WSH (invalid) - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -282,25 +124,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(spk_manager, nullptr);
    }

-    // (P2PKH inside) P2WSH inside P2WSH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript witnessscript_inner = GetScriptForDestination(PKHash(pubkeys[0]));
-        CScript witnessscript = GetScriptForDestination(WitnessV0ScriptHash(witnessscript_inner));
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript_inner));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
    // (P2PKH inside) P2WSH inside P2WSH (invalid) - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -310,22 +133,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(spk_manager, nullptr);
    }

-    // P2WPKH compressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey = GetScriptForDestination(WitnessV0KeyHash(pubkeys[0]));
-
-        // Keystore implicitly has key and P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2WPKH compressed - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -338,27 +145,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2WPKH uncompressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-
-        scriptPubKey = GetScriptForDestination(WitnessV0KeyHash(uncompressedPubkey));
-
-        // Keystore has key, but no P2SH redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key and P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
    // P2WPKH uncompressed (invalid) - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -368,41 +154,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(spk_manager, nullptr);
    }

-    // scriptPubKey multisig - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        scriptPubKey = GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
-
-        // Keystore does not have any keys
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has 1/2 keys
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has 2/2 keys
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has 2/2 keys and the script
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
    // scriptPubKey multisig - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -415,29 +166,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2SH multisig - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        CScript redeemScript = GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemScript));
-
-        // Keystore has no redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2SH multisig - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -452,35 +180,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2WSH multisig with compressed keys - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        CScript witnessScript = GetScriptForMultisig(2, {pubkeys[0], pubkeys[1]});
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessScript));
-
-        // Keystore has keys, but no witnessScript or P2SH redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys and witnessScript, but no P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys, witnessScript, P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2WSH multisig with compressed keys - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -495,35 +194,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }

-    // P2WSH multisig with uncompressed key - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        CScript witnessScript = GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessScript));
-
-        // Keystore has keys, but no witnessScript or P2SH redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys and witnessScript, but no P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys, witnessScript, P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
    // P2WSH multisig with uncompressed key (invalid) - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -534,36 +204,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        BOOST_CHECK_EQUAL(spk_manager, nullptr);
    }

-    // P2WSH multisig wrapped in P2SH - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript witnessScript = GetScriptForMultisig(2, {pubkeys[0], pubkeys[1]});
-        CScript redeemScript = GetScriptForDestination(WitnessV0ScriptHash(witnessScript));
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemScript));
-
-        // Keystore has no witnessScript, P2SH redeemScript, or keys
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has witnessScript and P2SH redeemScript, but no keys
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemScript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys, witnessScript, P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
    // P2WSH multisig wrapped in P2SH - Descriptor
    {
        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -640,66 +280,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
        result = spk_manager->IsMine(scriptPubKey);
        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
    }
-
-    // OP_RETURN
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_RETURN << ToByteVector(pubkeys[0]);
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
-    // witness unspendable
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_0 << "aabb"_hex;
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
-    // witness unknown
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_16 << "aabb"_hex;
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
-    // Nonstandard
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_9 << OP_ADD << OP_11 << OP_EQUAL;
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
 }

 BOOST_AUTO_TEST_SUITE_END()