test: Get rid of default wallet hacks #20034

pull ryanofsky wants to merge 2 commits into bitcoin:master from ryanofsky:pr/defw changing 27 files +94 −92
  1. ryanofsky commented at 11:01 am on September 29, 2020: member

    Changes:

    • Get rid of setup_nodes (-wallet, -nowallet, -disablewallet) argument rewriting
    • Get rid of hardcoded wallet "" names and -wallet="" args

    Motivation:

    • Simplify test framework behavior so it’s easier to write new tests without having arguments mangled by the framework
    • Make tests more readable, replacing unexplained "" string literals with default_wallet_name references
    • Make it trivial to update default wallet name and wallet data filename for sqlite #19077 testing
    • Stop relying on -wallet arguments to create wallets, so it is easy to change -wallet option in the future to only load existing wallets not create new ones (to avoid accidental wallet creation, and encourage use of wallet encryption and descriptor features)
  2. test, refactor: add default_wallet_name and wallet_data_filename variables
    No changes in behavior
    ed3acda33b
  3. test: Get rid of default wallet hacks
    - Get rid of hardcoded wallet "" names and -wallet="" args
    - Get rid of setup_nodes (-wallet, -nowallet, -disablewallet) argument rewriting
    
    Motivation:
    
    - Simplify test framework behavior so it's easier to write new tests without
      having arguments mangled by the framework
    - Make tests more readable, replacing unexplained "" string literals with
      default_wallet_name references
    - Make it trivial to update default wallet name and wallet data filename for
      sqlite #19077 testing
    - Stop relying on -wallet arguments to create wallets, so it is easy to change
      -wallet option in the future to only load existing wallets not create new
      ones (to avoid accidental wallet creation, and encourage use of wallet
      encryption and descriptor features)
    c1585bca8d
  4. fanquake added the label Tests on Sep 29, 2020
  5. in test/functional/wallet_multiwallet.py:110 in 9fbba7ca87 outdated
    106@@ -108,7 +107,7 @@ def wallet_file(name):
    107 
    108         # should not initialize if wallet path can't be created
    109         exp_stderr = "boost::filesystem::create_directory:"
    110-        self.nodes[0].assert_start_raises_init_error(['-wallet=wallet.dat/bad'], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
    111+        self.nodes[0].assert_start_raises_init_error(['-wallet=w8/bad'], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
    


    ryanofsky commented at 11:55 am on September 29, 2020:
    Note: This change isn’t strictly necessary, but using w8 instead of wallet.dat here makes the test more robust so default_wallet_filename can be changed in the future. The top level wallet directory will always contain a w8 file, but may or may not contain a wallet.dat file, depending on the default_wallet_filename value.
  6. fanquake requested review from achow101 on Sep 29, 2020
  7. DrahtBot commented at 12:58 pm on September 29, 2020: member

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #19502 (Bugfix: Wallet: Soft-fail exceptions within ListWalletDir file checks by luke-jr)
    • #19297 ([test] WIP: rewrite generate() in test_node to gain determinism in test data by glowang)
    • #19168 (Refactor: Improve setup_clean_chain semantics by fjahr)
    • #18836 (wallet: upgradewallet fixes and additional tests by achow101)
    • #18788 (tests: Update more tests to work with descriptor wallets by achow101)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  8. MarcoFalke commented at 1:10 pm on September 29, 2020: member
    Do all of the changes need to happen in one commit? Also, the build without wallet doesn’t pass the tests
  9. ryanofsky commented at 2:30 pm on September 29, 2020: member

    Thanks, I’ll check the no wallet build. I don’t think this is PR hard to review. It was very difficult to write, because every one change I made broke other things and required more changes. But in the end, the main change was just dropping -wallet="" arguments and tweaking things to work around the dropped arguments.

    I would also expect if you’re looking at one test and want to see how this PR affects the test, you’d rather look at one diff instead of multiple diffs. But I guess you have that option regardless by diffing across commits, so I’ll see if there are sensible ways to have multiple commits.

  10. ryanofsky force-pushed on Sep 29, 2020
  11. ryanofsky commented at 3:03 pm on September 29, 2020: member
    Updated 9fbba7ca8712be85a72b8499c437c6259b171d03 -> c072c8585dde004db0aadbf4309fb97a952a6f29 (pr/defw.1 -> pr/defw.2, compare) with suggestions from Marco (thanks!) splitting up commits and adding missing is_wallet_compiled check
  12. achow101 commented at 4:16 pm on September 29, 2020: member
    I don’t really like removing the createwallet override as it makes it more difficult to enable additional tests for descriptor wallets and lets us enable a test for descriptor wallets without having to modify every createwallet call in a test.
  13. ryanofsky force-pushed on Sep 29, 2020
  14. ryanofsky commented at 5:08 pm on September 29, 2020: member

    re: @achow101 #20034 (comment)

    I don’t really like removing the createwallet override as it makes it more difficult to enable additional tests for descriptor wallets and lets us enable a test for descriptor wallets without having to modify every createwallet call in a test.

    Thanks! Dropped commit be968c406944a74550799d28200255436c880f4b as I didn’t realize it was separable. The change does seem like a win to me for simplicity and making things explicit, so maybe I will try to revive it in some form. But there’s no reason to include it here.


    Updated c072c8585dde004db0aadbf4309fb97a952a6f29 -> 5338dfaef077b5c38e3a87d76f12068147a5db2d (pr/defw.2 -> pr/defw.3, compare) just dropping commit be968c406944a74550799d28200255436c880f4b

  15. in test/functional/tool_wallet.py:216 in cef6f09997 outdated
    212@@ -213,7 +213,7 @@ def test_salvage(self):
    213         self.assert_tool_output('', '-wallet=salvage', 'salvage')
    214 
    215     def run_test(self):
    216-        self.wallet_path = os.path.join(self.nodes[0].datadir, self.chain, 'wallets', 'wallet.dat')
    


    achow101 commented at 5:27 pm on September 29, 2020:
    Should the -wallet=wallet.dat throughout this test use self.wallet_data_filename too then?

    ryanofsky commented at 6:44 pm on September 29, 2020:

    re: #20034 (review)

    Should the -wallet=wallet.dat throughout this test use self.wallet_data_filename too then?

    It effectively is. I think you are maybe only looking at the first commit, not the overall diff? The wallet.dat references are removed in the second commit, since more robust way to refer to wallets is by directory name not data file name. (The data file name used inside wallets is an implementation detail and referring to it is only supported in limited cases for backwards compatibility. Dropping references to the data file name lets the test work with all default_wallet_name values.)

  16. in test/functional/wallet_multiwallet.py:97 in cef6f09997 outdated
     93@@ -94,10 +94,10 @@ def wallet_file(name):
     94         #   w7_symlink - to verify symlinked wallet path is initialized correctly
     95         #   w8         - to verify existing wallet file is loaded correctly
     96         #   ''         - to verify default wallet file is created correctly
     97-        wallet_names = ['w1', 'w2', 'w3', 'w', 'sub/w5', os.path.join(self.options.tmpdir, 'extern/w6'), 'w7_symlink', 'w8', '']
     98-        extra_args = ['-wallet={}'.format(n) for n in wallet_names]
     99+        wallet_names = ['w1', 'w2', 'w3', 'w', 'sub/w5', os.path.join(self.options.tmpdir, 'extern/w6'), 'w7_symlink', 'w8', self.default_wallet_name]
    100+        extra_args = ['-nowallet'] + ['-wallet={}'.format(n) for n in wallet_names]
    


    achow101 commented at 5:30 pm on September 29, 2020:
    Why?

    ryanofsky commented at 6:49 pm on September 29, 2020:

    re: #20034 (review)

    Why?

    Specifying -nowallet keeps test behavior unchanged now that the load on startup option is used. Probably if you were writing this test from scratch, you would drop -nowallet and instead change the checks below. But this is the most minimal update for the existing test, it is also nice because it keeps the test more narrow and robust to outside changes.


    MarcoFalke commented at 9:18 am on October 1, 2020:

    in the first commit:

    The test passes without this change, so I am still wondering why this is needed.

    Also, the commit doesn’t seem to be exhaustive. The wallet.dat/bad should be replaced as well. Also, the usages in tool_wallet.py. See the diff I used for testing:

      0diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
      1index bd1d114730..89d7325e1c 100644
      2--- a/src/wallet/db.cpp
      3+++ b/src/wallet/db.cpp
      4@@ -20,6 +20,6 @@ void SplitWalletPath(const fs::path& wallet_path, fs::path& env_directory, std::
      5         // Normal case: Interpret wallet path as a directory path containing
      6         // data and log files.
      7         env_directory = wallet_path;
      8-        database_filename = "wallet.dat";
      9+        database_filename = "wallet_dat";
     10     }
     11 }
     12diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp
     13index 8f0083cd2e..3489d48879 100644
     14--- a/src/wallet/test/db_tests.cpp
     15+++ b/src/wallet/test/db_tests.cpp
     16@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
     17 
     18 BOOST_AUTO_TEST_CASE(getwalletenv_directory)
     19 {
     20-    std::string expected_name = "wallet.dat";
     21+    std::string expected_name = "wallet_dat";
     22     const fs::path datadir = GetDataDir();
     23 
     24     std::string filename;
     25diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
     26index e4c72aed98..3a16cb3e75 100644
     27--- a/src/wallet/walletutil.cpp
     28+++ b/src/wallet/walletutil.cpp
     29@@ -71,11 +71,11 @@ std::vector<fs::path> ListWalletDir()
     30         // This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60.
     31         const fs::path path = it->path().string().substr(offset);
     32 
     33-        if (it->status().type() == fs::directory_file && IsBerkeleyBtree(it->path() / "wallet.dat")) {
     34+        if (it->status().type() == fs::directory_file && IsBerkeleyBtree(it->path() / "wallet_dat")) {
     35             // Found a directory which contains wallet.dat btree file, add it as a wallet.
     36             paths.emplace_back(path);
     37         } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && IsBerkeleyBtree(it->path())) {
     38-            if (it->path().filename() == "wallet.dat") {
     39+            if (it->path().filename() == "wallet_dat") {
     40                 // Found top-level wallet.dat btree file, add top level directory ""
     41                 // as a wallet.
     42                 paths.emplace_back();
     43diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
     44index 100be26c59..fa72420178 100755
     45--- a/test/functional/test_framework/test_framework.py
     46+++ b/test/functional/test_framework/test_framework.py
     47@@ -103,7 +103,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
     48         self.supports_cli = True
     49         self.bind_to_localhost_only = True
     50         self.default_wallet_name = ""
     51-        self.wallet_data_filename = "wallet.dat"
     52+        self.wallet_data_filename = "wallet_dat"
     53         self.set_test_params()
     54         self.parse_args()
     55         if self.options.timeout_factor == 0 :
     56diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py
     57index ef68e224b6..8d3e7f8f62 100755
     58--- a/test/functional/tool_wallet.py
     59+++ b/test/functional/tool_wallet.py
     60@@ -73,7 +73,7 @@ class ToolWalletTest(BitcoinTestFramework):
     61         locked_dir = os.path.join(self.options.tmpdir, "node0", "regtest", "wallets")
     62         self.assert_raises_tool_error(
     63             'Error initializing wallet database environment "{}"!'.format(locked_dir),
     64-            '-wallet=wallet.dat',
     65+            '-wallet=wallet_dat',
     66             'info',
     67         )
     68         path = os.path.join(self.options.tmpdir, "node0", "regtest", "wallets", "nonexistent.dat")
     69@@ -104,7 +104,7 @@ class ToolWalletTest(BitcoinTestFramework):
     70             Transactions: 0
     71             Address Book: 3
     72         ''')
     73-        self.assert_tool_output(out, '-wallet=wallet.dat', 'info')
     74+        self.assert_tool_output(out, '-wallet=wallet_dat', 'info')
     75         timestamp_after = self.wallet_timestamp()
     76         self.log.debug('Wallet file timestamp after calling info: {}'.format(timestamp_after))
     77         self.log_wallet_timestamp_comparison(timestamp_before, timestamp_after)
     78@@ -143,7 +143,7 @@ class ToolWalletTest(BitcoinTestFramework):
     79             Transactions: 1
     80             Address Book: 3
     81         ''')
     82-        self.assert_tool_output(out, '-wallet=wallet.dat', 'info')
     83+        self.assert_tool_output(out, '-wallet=wallet_dat', 'info')
     84         shasum_after = self.wallet_shasum()
     85         timestamp_after = self.wallet_timestamp()
     86         self.log.debug('Wallet file timestamp after calling info: {}'.format(timestamp_after))
     87diff --git a/test/functional/wallet_dump.py b/test/functional/wallet_dump.py
     88index 09581d864b..5fdabf89c8 100755
     89--- a/test/functional/wallet_dump.py
     90+++ b/test/functional/wallet_dump.py
     91@@ -203,7 +203,7 @@ class WalletDumpTest(BitcoinTestFramework):
     92         assert result['ismine']
     93 
     94         self.log.info('Check that wallet is flushed')
     95-        with self.nodes[0].assert_debug_log(['Flushing wallet.dat'], timeout=20):
     96+        with self.nodes[0].assert_debug_log(['Flushing wallet_dat'], timeout=20):
     97             self.nodes[0].getnewaddress()
     98 
     99 
    100diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py
    101index 7b975af065..71aa86abdb 100755
    102--- a/test/functional/wallet_multiwallet.py
    103+++ b/test/functional/wallet_multiwallet.py
    104@@ -95,7 +95,7 @@ class MultiWalletTest(BitcoinTestFramework):
    105         #   w8         - to verify existing wallet file is loaded correctly
    106         #   ''         - to verify default wallet file is created correctly
    107         wallet_names = ['w1', 'w2', 'w3', 'w', 'sub/w5', os.path.join(self.options.tmpdir, 'extern/w6'), 'w7_symlink', 'w8', self.default_wallet_name]
    108-        extra_args = ['-nowallet'] + ['-wallet={}'.format(n) for n in wallet_names]
    109+        extra_args = ['-wallet={}'.format(n) for n in wallet_names]
    110         self.start_node(0, extra_args)
    111         assert_equal(sorted(map(lambda w: w['name'], self.nodes[0].listwalletdir()['wallets'])), [self.default_wallet_name, os.path.join('sub', 'w5'), 'w', 'w1', 'w2', 'w3', 'w7', 'w7_symlink', 'w8'])
    112 
    113@@ -108,7 +108,7 @@ class MultiWalletTest(BitcoinTestFramework):
    114 
    115         # should not initialize if wallet path can't be created
    116         exp_stderr = "boost::filesystem::create_directory:"
    117-        self.nodes[0].assert_start_raises_init_error(['-wallet=wallet.dat/bad'], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
    118+        self.nodes[0].assert_start_raises_init_error(['-wallet={}/bad'.format(self.wallet_data_filename)], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
    119 
    120         self.nodes[0].assert_start_raises_init_error(['-walletdir=wallets'], 'Error: Specified -walletdir "wallets" does not exist')
    121         self.nodes[0].assert_start_raises_init_error(['-walletdir=wallets'], 'Error: Specified -walletdir "wallets" is a relative path', cwd=data_dir())
    

    ryanofsky commented at 10:09 am on October 1, 2020:

    re: #20034 (review)

    in the first commit:

    The test passes without this change, so I am still wondering why this is needed.

    Oh, good catch. That was supposed to be in the second commit not the first. -nowallet makes the list of wallets which are loaded explicit, and the tradeoffs around using it here are described in #20034 (review). The change is necessary to be able to make default_wallet_name nonempty as described in PR description (to add multiwallet test coverage for #19077, to fix accidental wallet creation problems in #15454).

    Also, the commit doesn’t seem to be exhaustive. The wallet.dat/bad should be replaced as well. Also, the usages in tool_wallet.py. See the diff I used for testing:

    That’s a useful test, but I think it makes more sense to apply to the overall PR, not the first commit. Applying it to the first commit and making the first commit exhaustive with temporary changes that are subsequently replaced seems like it just adds more code to review and more opportunities to make mistakes in the PR. I would prefer not to make extra changes in the first commit if we can both agree it does not affect the final outcome.

  17. achow101 commented at 7:12 pm on September 29, 2020: member
    ACK 5338dfaef077b5c38e3a87d76f12068147a5db2d
  18. fanquake requested review from meshcollider on Oct 1, 2020
  19. in test/functional/test_framework/test_framework.py:105 in 5338dfaef0 outdated
    101@@ -102,6 +102,7 @@ def __init__(self):
    102         self.rpc_timeout = 60  # Wait for up to 60 seconds for the RPC server to respond
    103         self.supports_cli = True
    104         self.bind_to_localhost_only = True
    105+        self.wallet_names = None
    


    MarcoFalke commented at 9:33 am on October 1, 2020:

    in commit 5338dfaef077b5c38e3a87d76f12068147a5db2d:

    Would be good to add a short comment here to say:

    • Will be used to create wallets on setup
    • Defaults to create a default wallet for each node
    • List can be shorter than the number of nodes, or include None entries to skip wallet creation

    ryanofsky commented at 10:12 am on October 1, 2020:

    re: #20034 (review)

    in commit 5338dfa:

    Would be good to add a short comment here to say:

    Thanks! Added

  20. in test/functional/test_framework/test_framework.py:396 in 5338dfaef0 outdated
    392-            except JSONRPCException as e:
    393-                assert str(e).startswith('Method not found')
    394-                continue
    395-
    396+        wallet_names = [self.default_wallet_name] * len(self.nodes) if self.wallet_names is None else self.wallet_names
    397+        for wallet_name, n in zip(wallet_names, self.nodes):
    


    MarcoFalke commented at 9:34 am on October 1, 2020:
    Could add an assert to check self.num_nodes >= len(wallet_names)?

    ryanofsky commented at 10:12 am on October 1, 2020:

    re: #20034 (review)

    Could add an assert to check self.num_nodes >= len(wallet_names)?

    Thanks! Added

  21. MarcoFalke commented at 9:34 am on October 1, 2020: member
    Concept ACK 5338dfaef077b5c38e3a87d76f12068147a5db2d. Skimmed the two commits and left some coments.
  22. ryanofsky force-pushed on Oct 1, 2020
  23. ryanofsky commented at 11:32 am on October 1, 2020: member

    Thanks for the review!

    Updated 5338dfaef077b5c38e3a87d76f12068147a5db2d -> c1585bca8dae01dee6a1dd8eadae2f8b100503df (pr/defw.3 -> pr/defw.4, compare) with suggested changes

  24. MarcoFalke commented at 3:07 pm on October 2, 2020: member

    ACK c1585bca8dae01dee6a1dd8eadae2f8b100503df, only effective change is adding documentation 🎵

    Signature:

     0-----BEGIN PGP SIGNED MESSAGE-----
     1Hash: SHA512
     2
     3ACK c1585bca8dae01dee6a1dd8eadae2f8b100503df, only effective change is adding documentation 🎵
     4-----BEGIN PGP SIGNATURE-----
     5
     6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
     7pUhp/gv9HLJ3Y2W8Ok3zvRURR+0h8Qo5u1mOhbHmlS/HNUyM92HAL9OI7D+J+uZa
     84ZlfbjiNaGgqEWcrbI1ptkPUy1VsBRCZKSmAMpJdQ9ahbY8UAQo/x1AyBYSnFdPD
     9MxSxfQ81YzwE8aCvezZdkBGx3t4f1EcBK2+2Q1e8EPjHhNOdZLfEAXoo0CIoBpB9
    10DzKEMh9hzRE5M3/ELloNLMhVy4XJ7HcH/GjoSPuxQggEKIDBluBiJDaCi2MnTV0C
    11vqj61OVr4ekci/YhpIvY049iW2XP3jp4qfYPHiInn8IK+swTlrSQ7dFjTfS10etr
    12wEmfNHWWlmvGQe1pUBIdabQ+FpwBC8CLg8NPavETm+mRx98EL2GwdPPCiPsU3oS+
    13VWttIL28ICzQZEpcDXcXij2XodcOANVlGifhmyxxxlyj2hVNU8cWp2Ep5fw1kcnH
    14eAn7wZztEJntWSKc7BhJW9EJ+rA+CX+OSMT7dBmqVVXUDP6XwaVlUoZ/sqWWPjcy
    15jTy++c1j
    16=XL4w
    17-----END PGP SIGNATURE-----
    

    Timestamp of file with hash 21bb7e58a106d518ab420a88873a29f5a4a1169244282ef31f53cec8fd2f3417 -

  25. MarcoFalke merged this on Oct 2, 2020
  26. MarcoFalke closed this on Oct 2, 2020

  27. MarcoFalke commented at 3:36 pm on October 2, 2020: member

    Tested with

     0diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
     1index bd1d114730..89d7325e1c 100644
     2--- a/src/wallet/db.cpp
     3+++ b/src/wallet/db.cpp
     4@@ -20,6 +20,6 @@ void SplitWalletPath(const fs::path& wallet_path, fs::path& env_directory, std::
     5         // Normal case: Interpret wallet path as a directory path containing
     6         // data and log files.
     7         env_directory = wallet_path;
     8-        database_filename = "wallet.dat";
     9+        database_filename = "wallet_dat";
    10     }
    11 }
    12diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp
    13index 8f0083cd2e..3489d48879 100644
    14--- a/src/wallet/test/db_tests.cpp
    15+++ b/src/wallet/test/db_tests.cpp
    16@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
    17 
    18 BOOST_AUTO_TEST_CASE(getwalletenv_directory)
    19 {
    20-    std::string expected_name = "wallet.dat";
    21+    std::string expected_name = "wallet_dat";
    22     const fs::path datadir = GetDataDir();
    23 
    24     std::string filename;
    25diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
    26index e4c72aed98..3a16cb3e75 100644
    27--- a/src/wallet/walletutil.cpp
    28+++ b/src/wallet/walletutil.cpp
    29@@ -71,11 +71,11 @@ std::vector<fs::path> ListWalletDir()
    30         // This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60.
    31         const fs::path path = it->path().string().substr(offset);
    32 
    33-        if (it->status().type() == fs::directory_file && IsBerkeleyBtree(it->path() / "wallet.dat")) {
    34+        if (it->status().type() == fs::directory_file && IsBerkeleyBtree(it->path() / "wallet_dat")) {
    35             // Found a directory which contains wallet.dat btree file, add it as a wallet.
    36             paths.emplace_back(path);
    37         } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && IsBerkeleyBtree(it->path())) {
    38-            if (it->path().filename() == "wallet.dat") {
    39+            if (it->path().filename() == "wallet_dat") {
    40                 // Found top-level wallet.dat btree file, add top level directory ""
    41                 // as a wallet.
    42                 paths.emplace_back();
    43diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
    44index 2824d80434..6ab813ff1c 100755
    45--- a/test/functional/test_framework/test_framework.py
    46+++ b/test/functional/test_framework/test_framework.py
    47@@ -104,7 +104,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
    48         self.bind_to_localhost_only = True
    49         self.parse_args()
    50         self.default_wallet_name = ""
    51-        self.wallet_data_filename = "wallet.dat"
    52+        self.wallet_data_filename = "wallet_dat"
    53         # Optional list of wallet names that can be set in set_test_params to
    54         # create and import keys to. If unset, default is len(nodes) *
    55         # [default_wallet_name]. If wallet names are None, wallet creation is
    56diff --git a/test/functional/wallet_dump.py b/test/functional/wallet_dump.py
    57index 09581d864b..5fdabf89c8 100755
    58--- a/test/functional/wallet_dump.py
    59+++ b/test/functional/wallet_dump.py
    60@@ -203,7 +203,7 @@ class WalletDumpTest(BitcoinTestFramework):
    61         assert result['ismine']
    62 
    63         self.log.info('Check that wallet is flushed')
    64-        with self.nodes[0].assert_debug_log(['Flushing wallet.dat'], timeout=20):
    65+        with self.nodes[0].assert_debug_log(['Flushing wallet_dat'], timeout=20):
    66             self.nodes[0].getnewaddress()
    67 
    68 
    
  28. sidhujag referenced this in commit d9630d6f44 on Oct 4, 2020
  29. Fabcien referenced this in commit 975d0e385a on Nov 3, 2021
  30. Fabcien referenced this in commit fecd97791c on Nov 3, 2021
  31. DrahtBot locked this on Feb 15, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-10-08 16:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me