TEMPORARY COMMIT

This commit is only needed until dashpay#3110 is merged

Author: codablock

test/functional/minchainwork.py

@@ -24,7 +24,8 @@
 REGTEST_WORK_PER_BLOCK = 2
 
 class MinimumChainWorkTest(BitcoinTestFramework):
-    def set_test_params(self):
+    def __init__(self):
+        super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 3
 

test/functional/multiwallet.py

@@ -33,7 +33,7 @@ def run_test(self):
         # should not initialize if one wallet is a copy of another
         shutil.copyfile(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w2'),
                         os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w22'))
-        self.assert_start_raises_init_error(0, ['-wallet=w2', '-wallet=w22'], 'duplicates fileid')
+        self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w2', '-wallet=w22'], 'duplicates fileid')
 
         # should not initialize if wallet file is a symlink
         os.symlink(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w1'), os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w12'))