From 7a2a31a74fa5cd88f52e29150c48d2a891985d99 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 15 Aug 2023 01:35:36 +0700
Subject: [PATCH] fix: fillow-up Merge #18774: test: added test for
 upgradewallet RPC

 - partial dashification
 - disabling this test so far as it does not work anyway
---
 test/functional/test_framework/util.py  |  2 +-
 test/functional/wallet_upgradewallet.py | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index f28816fcb85141..950a4b354f5926 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -345,7 +345,7 @@ def initialize_datadir(dirname, n, chain):
         os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)
     return datadir
 
-def adjust_bitcoin_conf_for_pre_17(conf_file):
+def adjust_bitcoin_conf_for_pre_16(conf_file):
     with open(conf_file,'r', encoding='utf8') as conf:
         conf_data = conf.read()
     with open(conf_file, 'w', encoding='utf8') as conf:
diff --git a/test/functional/wallet_upgradewallet.py b/test/functional/wallet_upgradewallet.py
index b1a5fea2fce195..67f7e6df2e0c5c 100755
--- a/test/functional/wallet_upgradewallet.py
+++ b/test/functional/wallet_upgradewallet.py
@@ -11,9 +11,9 @@
 import os
 import shutil
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import (BitcoinTestFramework, SkipTest)
 from test_framework.util import (
-    adjust_bitcoin_conf_for_pre_17,
+    adjust_bitcoin_conf_for_pre_16,
     assert_equal,
     assert_greater_than,
     assert_is_hex_string,
@@ -25,7 +25,7 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 3
         self.extra_args = [
-            ["-addresstype=bech32"], # current wallet version
+            [], # current wallet version
             ["-usehd=1"],            # v0.16.3 wallet
             ["-usehd=0"]             # v0.15.2 wallet
         ]
@@ -35,6 +35,8 @@ def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
         self.skip_if_no_bdb()
         self.skip_if_no_previous_releases()
+        # TODO: this test doesn't work yet
+        raise SkipTest("Test wallet_upgradewallet.py is not adopted for Dash Core yet.")
 
     def setup_network(self):
         self.setup_nodes()
@@ -45,9 +47,8 @@ def setup_nodes(self):
             160300,
             150200,
         ])
-        # adapt bitcoin.conf, because older bitcoind's don't recognize config sections
-        adjust_bitcoin_conf_for_pre_17(self.nodes[1].bitcoinconf)
-        adjust_bitcoin_conf_for_pre_17(self.nodes[2].bitcoinconf)
+        # adapt dash.conf, because older dashd's don't recognize config sections
+        adjust_bitcoin_conf_for_pre_16(self.nodes[2].bitcoinconf)
         self.start_nodes()
         self.import_deterministic_coinbase_privkeys()
 
@@ -94,7 +95,7 @@ def run_test(self):
         v15_2_wallet       = os.path.join(v15_2_node.datadir, "regtest/wallet.dat")
         self.stop_nodes()
 
-        # Copy the 0.16.3 wallet to the last Bitcoin Core version and open it:
+        # Copy the 0.16.3 wallet to the last Dash Core version and open it:
         shutil.rmtree(node_master_wallet_dir)
         os.mkdir(node_master_wallet_dir)
         shutil.copy(
@@ -117,7 +118,7 @@ def run_test(self):
         assert_equal(wallet.getbalance(), v16_3_balance)
 
         self.stop_node(0)
-        # Copy the 0.15.2 wallet to the last Bitcoin Core version and open it:
+        # Copy the 0.15.2 wallet to the last Dash Core version and open it:
         shutil.rmtree(node_master_wallet_dir)
         os.mkdir(node_master_wallet_dir)
         shutil.copy(