diff --git a/test/functional/feature_blocksxor.py b/test/functional/feature_blocksxor.py index 88e0244cd42..e9d89ede8f5 100755 --- a/test/functional/feature_blocksxor.py +++ b/test/functional/feature_blocksxor.py @@ -54,7 +54,7 @@ class BlocksXORTest(BitcoinTestFramework): match=ErrorMatch.PARTIAL_REGEX) self.log.info("Delete XOR key, restart node with '-blocksxor=0', check blk*.dat/rev*.dat file integrity") - os.remove(node.blocks_path / 'xor.dat') + os.remove(node.blocks_key_path) self.start_node(0, extra_args=['-blocksxor=0']) # checklevel=2 -> verify block validity + undo data # nblocks=0 -> verify all blocks diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index b73566b0e95..9e037345f36 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -465,6 +465,10 @@ class TestNode(): def blocks_path(self) -> Path: return self.chain_path / "blocks" + @property + def blocks_key_path(self) -> Path: + return self.blocks_path / "xor.dat" + @property def wallets_path(self) -> Path: return self.chain_path / "wallets" diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index c3bc861cf6e..2372683c042 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -516,7 +516,7 @@ def check_node_connections(*, node, num_in, num_out): def read_xor_key(*, node): - with open(node.blocks_path / "xor.dat", "rb") as xor_f: + with open(node.blocks_key_path, "rb") as xor_f: NUM_XOR_BYTES = 8 # From InitBlocksdirXorKey::xor_key.size() return xor_f.read(NUM_XOR_BYTES)