Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-28 13:02:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#32440: test: remove bdb assert in tool_wallet.py

Browse Source 
e08e6567f2 test: remove assert_dump since it is not used anymore (kevkevinpal)
4b6dd9790b test: remove bdb assert in tool_wallet.py (kevkevinpal)

Pull request description:

  As suggested in https://github.com/bitcoin/bitcoin/pull/32438#issuecomment-2859123413

  legacy wallet and the BDB dependency was removed (https://github.com/bitcoin/bitcoin/pull/28710) so this assert is safe to delete

ACKs for top commit:
  davidgumberg:
    reACK e08e6567f2
  achow101:
    ACK e08e6567f2
  brunoerg:
    reACK e08e6567f2
  theStack:
    re-ACK e08e6567f2

Tree-SHA512: 6417537d7b9b5da6039dfcc94a86107211d57dcca43becea6f95d4a95f342e12918b0ff6a562261ba538b7b206de7d327e52bdb7d49e353f1917df8668558a99
This commit is contained in:
Ava Chow 2025-05-07 11:51:17 -07:00
commit 1b1b9f32cf
No known key found for this signature in database
GPG Key ID: 17565732E08E5E41
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/functional/tool_wallet.py
View File

@ -95,12 +95,6 @@ class ToolWalletTest(BitcoinTestFramework):
file_magic = f.read(16) file_magic = f.read(16)
assert file_magic == b'SQLite format 3\x00' assert file_magic == b'SQLite format 3\x00'
def assert_is_bdb(self, filename):
with open(filename, 'rb') as f:
f.seek(12, 0)
file_magic = f.read(4)
assert file_magic == b'\x00\x05\x31\x62' or file_magic == b'\x62\x31\x05\x00'
def write_dump(self, dump, filename, magic=None, skip_checksum=False): def write_dump(self, dump, filename, magic=None, skip_checksum=False):
if magic is None: if magic is None:
magic = "BITCOIN_CORE_WALLET_DUMP" magic = "BITCOIN_CORE_WALLET_DUMP"
@ -116,27 +110,6 @@ class ToolWalletTest(BitcoinTestFramework):
row = ",".join(["checksum", dump["checksum"]]) + "\n" row = ",".join(["checksum", dump["checksum"]]) + "\n"
f.write(row) f.write(row)
def assert_dump(self, expected, received):
e = expected.copy()
r = received.copy()
# BDB will add a "version" record that is not present in sqlite
# In that case, we should ignore this record in both
# But because this also effects the checksum, we also need to drop that.
v_key = "0776657273696f6e" # Version key
if v_key in e and v_key not in r:
del e[v_key]
del e["checksum"]
del r["checksum"]
if v_key not in e and v_key in r:
del r[v_key]
del e["checksum"]
del r["checksum"]
assert_equal(len(e), len(r))
for k, v in e.items():
assert_equal(v, r[k])
def do_tool_createfromdump(self, wallet_name, dumpfile): def do_tool_createfromdump(self, wallet_name, dumpfile):
dumppath = self.nodes[0].datadir_path / dumpfile dumppath = self.nodes[0].datadir_path / dumpfile
rt_dumppath = self.nodes[0].datadir_path / "rt-{}.dump".format(wallet_name) rt_dumppath = self.nodes[0].datadir_path / "rt-{}.dump".format(wallet_name)
@ -151,12 +124,8 @@ class ToolWalletTest(BitcoinTestFramework):
self.assert_tool_output("The dumpfile may contain private keys. To ensure the safety of your Bitcoin, do not share the dumpfile.\n", '-wallet={}'.format(wallet_name), '-dumpfile={}'.format(rt_dumppath), 'dump') self.assert_tool_output("The dumpfile may contain private keys. To ensure the safety of your Bitcoin, do not share the dumpfile.\n", '-wallet={}'.format(wallet_name), '-dumpfile={}'.format(rt_dumppath), 'dump')
rt_dump_data = self.read_dump(rt_dumppath)
wallet_dat = self.nodes[0].wallets_path / wallet_name / "wallet.dat" wallet_dat = self.nodes[0].wallets_path / wallet_name / "wallet.dat"
if rt_dump_data["format"] == "bdb": self.assert_is_sqlite(wallet_dat)
self.assert_is_bdb(wallet_dat)
else:
self.assert_is_sqlite(wallet_dat)
def test_invalid_tool_commands_and_args(self): def test_invalid_tool_commands_and_args(self):
self.log.info('Testing that various invalid commands raise with specific error messages') self.log.info('Testing that various invalid commands raise with specific error messages')