From 4bffaf040c29cec08235b07c6d2e6f9b8024580b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Gr=C3=B6n?= <per.eckerdal@gmail.com>
Date: Mon, 22 Jan 2018 08:21:04 +0100
Subject: [PATCH] Be consistent with how to #include test data headers

It helps the Bazel scripts to not have multiple search paths to a
single header, and it seems to be the right thing to do anyway.
---
 src/test/alert_tests.cpp       | 2 +-
 src/test/base58_tests.cpp      | 6 +++---
 src/test/script_tests.cpp      | 4 ++--
 src/test/sighash_tests.cpp     | 2 +-
 src/test/transaction_tests.cpp | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index ab3841c48..0bd8a2f39 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -10,7 +10,7 @@
 #include "chain.h"
 #include "chainparams.h"
 #include "clientversion.h"
-#include "data/alertTests.raw.h"
+#include "test/data/alertTests.raw.h"
 
 #include "main.h"
 #include "rpcprotocol.h"
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index ec159ed28..b6530ec36 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -4,9 +4,9 @@
 
 #include "base58.h"
 
-#include "data/base58_encode_decode.json.h"
-#include "data/base58_keys_invalid.json.h"
-#include "data/base58_keys_valid.json.h"
+#include "test/data/base58_encode_decode.json.h"
+#include "test/data/base58_keys_invalid.json.h"
+#include "test/data/base58_keys_valid.json.h"
 
 #include "key.h"
 #include "script/script.h"
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index b27dfc90a..24acb714e 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "data/script_invalid.json.h"
-#include "data/script_valid.json.h"
+#include "test/data/script_invalid.json.h"
+#include "test/data/script_valid.json.h"
 
 #include "core_io.h"
 #include "key.h"
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index a453bc5c5..130e4c6a3 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "consensus/validation.h"
-#include "data/sighash.json.h"
+#include "test/data/sighash.json.h"
 #include "main.h"
 #include "random.h"
 #include "script/interpreter.h"
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 4768e7604..771fc41bd 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "data/tx_invalid.json.h"
-#include "data/tx_valid.json.h"
+#include "test/data/tx_invalid.json.h"
+#include "test/data/tx_valid.json.h"
 #include "test/test_bitcoin.h"
 
 #include "init.h"