Merge f9dc45680f into 433412fd84

test/functional/wallet_descriptor.py

@@ -77,8 +77,6 @@ class WalletDescriptorTest(BitcoinTestFramework):
             self.nodes[0].createwallet(wallet_name="legacy1", descriptors=False)
             wallet_info = self.nodes[0].getwalletinfo()
             assert_equal(wallet_info['format'], 'bdb')
-            legacy1 = self.nodes[0].get_wallet_rpc('legacy1')
-            assert_raises_rpc_error(-4, "importdescriptors is not available for non-descriptor wallets", legacy1.importdescriptors, [{"desc": "abc", "timestamp": "now"}])
             self.nodes[0].unloadwallet("legacy1")
         else:
             self.log.warning("Skipping BDB test")

test/functional/wallet_migration.py

@@ -119,6 +119,7 @@ class WalletMigrationTest(BitcoinTestFramework):
         self.log.info("Test migration of a basic keys only wallet without balance")
         basic0 = self.create_legacy_wallet("basic0")
 
+        assert_raises_rpc_error(-4, "importdescriptors is not available for non-descriptor wallets", basic0.importdescriptors, [{"desc": "abc", "timestamp": "now"}])
         addr = basic0.getnewaddress()
         change = basic0.getrawchangeaddress()