highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-25 20:51:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33122: test: remove duplicated code in test/functional/wallet_migration.py

Browse Source 
6a7c0d3f87 test: refactor to remove duplicated test code (kevkevinpal)

Pull request description:

  This is a followup to https://github.com/bitcoin/bitcoin/pull/32273

  This removes duplicated code in `test/functional/wallet_migration.py`
  [6a7c0d3](6a7c0d3f87) addresses https://github.com/bitcoin/bitcoin/pull/32273/files#r2237317368

ACKs for top commit:
  l0rinc:
    code review ACK 6a7c0d3f87
  ryanofsky:
    Code review ACK 6a7c0d3f87. Nice test deduplication, thanks for following on this!
  jonatack:
    ACK 6a7c0d3f87

Tree-SHA512: 7c1a00106be93304b30f1296d8db0082e99135e2b4574aa4efbefba9b0f0aebe602a0bfabdd9fc188185b0045842c6e8fd031f9bd4d12fe35d3feb6ff5a95e5d
This commit is contained in:
merge-script
2025-08-06 11:08:28 +01:00
parent a45cc17d34 6a7c0d3f87
commit 45bdbb1317
1 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/functional/wallet_migration.py
View File

@@ -621,31 +621,10 @@ class WalletMigrationTest(BitcoinTestFramework):
assert_equal(info["descriptors"], False)
assert_equal(info["format"], "bdb")
def test_wallet_with_path_ending_in_slash(self):
self.log.info("Test migrating a wallet with a name/path ending in '/'")
# The last directory in the wallet's path
final_dir = "mywallet"
wallet_name = f"path/to/{final_dir}/"
wallet = self.create_legacy_wallet(wallet_name)
default = self.master_node.get_wallet_rpc(self.default_wallet_name)
addr = wallet.getnewaddress()
txid = default.sendtoaddress(addr, 1)
self.generate(self.master_node, 1)
bals = wallet.getbalances()
_, wallet = self.migrate_and_get_rpc(wallet_name)
assert wallet.gettransaction(txid)
assert_equal(bals, wallet.getbalances())
def test_wallet_with_path_ending_in_relative_specifier(self):
self.log.info("Test migrating a wallet with a name/path ending in a relative specifier, '..'")
wallet_ending_in_relative = "path/that/ends/in/.."
def test_wallet_with_path(self, wallet_path):
self.log.info("Test migrating a wallet with the following path/name: %s", wallet_path)
# the wallet data is actually inside of path/that/ends/
wallet = self.create_legacy_wallet(wallet_ending_in_relative)
wallet = self.create_legacy_wallet(wallet_path)
default = self.master_node.get_wallet_rpc(self.default_wallet_name)
addr = wallet.getnewaddress()
@@ -653,7 +632,7 @@ class WalletMigrationTest(BitcoinTestFramework):
self.generate(self.master_node, 1)
bals = wallet.getbalances()
_, wallet = self.migrate_and_get_rpc(wallet_ending_in_relative)
_, wallet = self.migrate_and_get_rpc(wallet_path)
assert wallet.gettransaction(txid)
@@ -1558,8 +1537,8 @@ class WalletMigrationTest(BitcoinTestFramework):
self.test_nonexistent()
self.test_unloaded_by_path()
self.test_wallet_with_relative_path()
self.test_wallet_with_path_ending_in_slash()
self.test_wallet_with_path_ending_in_relative_specifier()
self.test_wallet_with_path("path/to/mywallet/")
self.test_wallet_with_path("path/that/ends/in/..")
self.test_default_wallet()
self.test_direct_file()
self.test_addressbook()