test: extra tests for upgradetohd with & without wallet encryption

Author: knst

test/functional/wallet_mnemonicbits.py

@@ -10,6 +10,13 @@
     assert_equal,
 )
 
+custom_mnemonic = "similar behave slot swim scissors throw planet view ghost laugh drift calm"
+# this address belongs to custom mnemonic with no passphrase
+custom_address_1 = "yLpq97zZUsFQ2rdMqhcPKkYT36MoPK4Hob"
+# this address belongs to custom mnemonic with passphrase "custom-passphrase"
+custom_address_2 = "yYBPeZQcqgQHu9dxA5pKBWtYbK2hwfFHxf"
+
+
 class WalletMnemonicbitsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
@@ -97,35 +104,55 @@ def run_test(self):
         assert_equal(len(self.get_mnemonic(self.nodes[0].get_wallet_rpc("wallet_224")).split()), 21)              # 21 words
         assert_equal(len(self.get_mnemonic(self.nodes[0].get_wallet_rpc("wallet_256")).split()), 24)              # 24 words
 
-        self.test_upgradetohd_custom()
 
-    def test_upgradetohd_custom(self):
+        self.generate(self.nodes[0], COINBASE_MATURITY + 1)
+
+        self.nodes[0].get_wallet_rpc(self.default_wallet_name).sendtoaddress(custom_address_1, 11)
+        self.nodes[0].get_wallet_rpc(self.default_wallet_name).sendtoaddress(custom_address_2, 12)
+        self.generate(self.nodes[0], 1)
+
+
         self.log.info("Test upgradetohd with user defined mnemonic")
-        wname_1a = "w-custom-1a"
-        wname_1b = "w-custom-1b"
-        wname_2 = "w-custom-2"
+        self.test_upgradetohd_custom(False, False)
 
+        self.log.info("Test upgradetohd with user defined mnemonic, encrypt wallet after creation")
+        self.test_upgradetohd_custom(True, False)
+
+        self.log.info("Test upgradetohd with user defined mnemonic, encrypt wallet after upgradetohd")
+        self.test_upgradetohd_custom(False, True)
+
+    def test_upgradetohd_custom(self, to_encrypt_1, to_encrypt_2):
+        wname_1a = f"w-custom-1a-{to_encrypt_1}-{to_encrypt_2}"
+        wname_1b = f"w-custom-1b-{to_encrypt_1}-{to_encrypt_2}"
+        wname_2 = f"w-custom-2-{to_encrypt_1}-{to_encrypt_2}"
         wnames = [wname_1a, wname_1b, wname_2]
+
         for wname in wnames:
             self.nodes[0].createwallet(wname, blank=True)
+            if to_encrypt_1:
+                self.nodes[0].get_wallet_rpc(wname).encryptwallet("123")
+                self.nodes[0].get_wallet_rpc(wname).walletpassphrase("123", 100)
+
+        if to_encrypt_1:
+            self.nodes[0].get_wallet_rpc(wname_1a).upgradetohd(custom_mnemonic, "", "123")
+            self.nodes[0].get_wallet_rpc(wname_1b).upgradetohd(custom_mnemonic, "", "123")
+            self.nodes[0].get_wallet_rpc(wname_2).upgradetohd(custom_mnemonic, "custom-passphrase", "123")
+        else:
+            self.nodes[0].get_wallet_rpc(wname_1a).upgradetohd(custom_mnemonic)
+            self.nodes[0].get_wallet_rpc(wname_1b).upgradetohd(custom_mnemonic, "")
+            self.nodes[0].get_wallet_rpc(wname_2).upgradetohd(custom_mnemonic, "custom-passphrase")
 
-        custom_mnemonic = "similar behave slot swim scissors throw planet view ghost laugh drift calm"
-        # this address belongs to custom mnemonic with no passphrase
-        custom_address_1 = "yLpq97zZUsFQ2rdMqhcPKkYT36MoPK4Hob"
-        # this address belongs to custom mnemonic with passphrase "custom-passphrase"
-        custom_address_2 = "yYBPeZQcqgQHu9dxA5pKBWtYbK2hwfFHxf"
 
-        self.nodes[0].get_wallet_rpc(wname_1a).upgradetohd(custom_mnemonic)
-        self.nodes[0].get_wallet_rpc(wname_1b).upgradetohd(custom_mnemonic, "")
-        self.nodes[0].get_wallet_rpc(wname_2).upgradetohd(custom_mnemonic, "custom-passphrase")
-        self.generate(self.nodes[0], COINBASE_MATURITY + 1)
+        if to_encrypt_2:
+            for wname in wnames:
+                self.nodes[0].get_wallet_rpc(wname).encryptwallet("123")
+                self.nodes[0].get_wallet_rpc(wname).walletpassphrase("123", 100)
 
-        self.nodes[0].get_wallet_rpc(self.default_wallet_name).sendtoaddress(custom_address_1, 11)
-        self.nodes[0].get_wallet_rpc(self.default_wallet_name).sendtoaddress(custom_address_2, 12)
-        self.generate(self.nodes[0], 1)
         self.restart_node(0)
         for wname in wnames:
             self.nodes[0].loadwallet(wname)
+            if to_encrypt_1 or to_encrypt_2:
+                self.nodes[0].get_wallet_rpc(wname).walletpassphrase("123", 100)
 
         assert_equal(11, self.nodes[0].get_wallet_rpc(wname_1a).getbalance())
         assert_equal(11, self.nodes[0].get_wallet_rpc(wname_1b).getbalance())