Skip to content

Commit

Permalink
Be consistent with how to #include test data headers
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
per-gron committed Jan 23, 2018
1 parent 2ee9ce6 commit 4bffaf0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/test/alert_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/test/base58_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/test/script_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/test/sighash_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/test/transaction_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 4bffaf0

Please sign in to comment.