From c8176f758b5991c3797c32ee519d32c14b444991 Mon Sep 17 00:00:00 2001
From: tdb3 <106488469+tdb3@users.noreply.github.com>
Date: Tue, 20 Aug 2024 19:28:14 -0400
Subject: test: add blocks_key_path

Adds a convenience function to TestNode
to provide the path to the blocks xor key.
Updates util and feature_blocksxor to use it.
---
 test/functional/feature_blocksxor.py        | 2 +-
 test/functional/test_framework/test_node.py | 4 ++++
 test/functional/test_framework/util.py      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/functional/feature_blocksxor.py b/test/functional/feature_blocksxor.py
index 88e0244cd4..e9d89ede8f 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 b73566b0e9..9e037345f3 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 c3bc861cf6..2372683c04 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)
 
-- 
cgit v1.2.3