From fac5c373006a9e4bcbb56843bb85f1aca4d87599 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 16 Apr 2020 13:11:54 -0400 Subject: scripted-diff: Sort test includes -BEGIN VERIFY SCRIPT- # Mark all lines with #includes sed -i --regexp-extended -e 's/(#include <.*>)/\1 /g' $(git grep -l '#include' ./src/bench/ ./src/test ./src/wallet/test/) # Sort all marked lines git diff -U0 | ./contrib/devtools/clang-format-diff.py -p1 -i -v -END VERIFY SCRIPT- --- src/bench/bech32.cpp | 2 +- src/bench/bench.h | 2 +- src/bench/chacha_poly_aead.cpp | 2 +- src/bench/checkblock.cpp | 4 ++-- src/bench/checkqueue.cpp | 6 +++--- src/bench/crypto_hash.cpp | 6 +++--- src/bench/duplicate_inputs.cpp | 1 - src/bench/merkle_root.cpp | 4 ++-- src/bench/rpc_blockchain.cpp | 4 ++-- src/test/addrman_tests.cpp | 6 +++--- src/test/arith_uint256_tests.cpp | 10 +++++----- src/test/base32_tests.cpp | 2 +- src/test/base64_tests.cpp | 2 +- src/test/bip32_tests.cpp | 2 +- src/test/blockchain_tests.cpp | 2 +- src/test/bloom_tests.cpp | 4 ++-- src/test/checkqueue_tests.cpp | 10 +++++----- src/test/compilerbug_tests.cpp | 2 +- src/test/compress_tests.cpp | 2 +- src/test/crypto_tests.cpp | 4 ++-- src/test/cuckoocache_tests.cpp | 4 ++-- src/test/dbwrapper_tests.cpp | 2 +- src/test/descriptor_tests.cpp | 8 ++++---- src/test/fuzz/base_encode_decode.cpp | 2 +- src/test/fuzz/block.cpp | 2 +- src/test/fuzz/eval_script.cpp | 2 +- src/test/fuzz/hex.cpp | 2 +- src/test/fuzz/prevector.cpp | 4 ++-- src/test/getarg_tests.cpp | 2 +- src/test/hash_tests.cpp | 2 +- src/test/key_io_tests.cpp | 2 +- src/test/key_tests.cpp | 4 ++-- src/test/merkleblock_tests.cpp | 2 +- src/test/multisig_tests.cpp | 4 ++-- src/test/net_tests.cpp | 14 +++++++------- src/test/netbase_tests.cpp | 2 +- src/test/pmt_tests.cpp | 4 ++-- src/test/policyestimator_tests.cpp | 2 +- src/test/prevector_tests.cpp | 2 +- src/test/random_tests.cpp | 2 +- src/test/rpc_tests.cpp | 2 +- src/test/scheduler_tests.cpp | 2 +- src/test/script_p2sh_tests.cpp | 4 ++-- src/test/script_tests.cpp | 10 +++++----- src/test/scriptnum10.h | 2 +- src/test/scriptnum_tests.cpp | 2 +- src/test/serialize_tests.cpp | 2 +- src/test/sighash_tests.cpp | 4 ++-- src/test/sigopcount_tests.cpp | 4 ++-- src/test/timedata_tests.cpp | 2 +- src/test/transaction_tests.cpp | 8 ++++---- src/test/txvalidation_tests.cpp | 2 +- src/test/txvalidationcache_tests.cpp | 6 +++--- src/test/uint256_tests.cpp | 4 ++-- src/test/util/transaction_utils.cpp | 2 +- src/test/util_tests.cpp | 4 ++-- src/test/util_threadnames_tests.cpp | 6 +++--- src/test/versionbits_tests.cpp | 6 +++--- src/wallet/test/coinselector_tests.cpp | 8 ++++---- 59 files changed, 112 insertions(+), 113 deletions(-) (limited to 'src') diff --git a/src/bench/bech32.cpp b/src/bench/bech32.cpp index f2fc3999fe..bcaa4863a0 100644 --- a/src/bench/bech32.cpp +++ b/src/bench/bech32.cpp @@ -7,8 +7,8 @@ #include #include -#include #include +#include static void Bech32Encode(benchmark::State& state) diff --git a/src/bench/bench.h b/src/bench/bench.h index 6b7a0f76d1..0a0fa99c67 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -5,11 +5,11 @@ #ifndef BITCOIN_BENCH_BENCH_H #define BITCOIN_BENCH_BENCH_H +#include #include #include #include #include -#include #include #include diff --git a/src/bench/chacha_poly_aead.cpp b/src/bench/chacha_poly_aead.cpp index a02a5315a4..6f2fb4c107 100644 --- a/src/bench/chacha_poly_aead.cpp +++ b/src/bench/chacha_poly_aead.cpp @@ -8,8 +8,8 @@ #include // for the POLY1305_TAGLEN constant #include -#include #include +#include /* Number of bytes to process per iteration */ static constexpr uint64_t BUFFER_SIZE_TINY = 64; diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp index 55786126b3..c194343631 100644 --- a/src/bench/checkblock.cpp +++ b/src/bench/checkblock.cpp @@ -6,9 +6,9 @@ #include #include -#include -#include #include +#include +#include // These are the two major time-sinks which happen after we have fully received // a block off the wire, but before we can relay the block on to peers using diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp index f5f96a0136..e0375fc156 100644 --- a/src/bench/checkqueue.cpp +++ b/src/bench/checkqueue.cpp @@ -3,12 +3,12 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include +#include #include #include -#include -#include #include +#include +#include static const int MIN_CORES = 2; diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp index a9d4d78888..996f2818f7 100644 --- a/src/bench/crypto_hash.cpp +++ b/src/bench/crypto_hash.cpp @@ -4,14 +4,14 @@ #include -#include -#include -#include #include #include #include #include #include +#include +#include +#include /* Number of bytes to hash per iteration */ static const uint64_t BUFFER_SIZE = 1000*1000; diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp index a783370b4e..402c71db76 100644 --- a/src/bench/duplicate_inputs.cpp +++ b/src/bench/duplicate_inputs.cpp @@ -11,7 +11,6 @@ #include - static void DuplicateInputs(benchmark::State& state) { const CScript SCRIPT_PUB{CScript(OP_TRUE)}; diff --git a/src/bench/merkle_root.cpp b/src/bench/merkle_root.cpp index bdb2bdbe3d..880d9d0f8a 100644 --- a/src/bench/merkle_root.cpp +++ b/src/bench/merkle_root.cpp @@ -4,9 +4,9 @@ #include -#include -#include #include +#include +#include static void MerkleRoot(benchmark::State& state) { diff --git a/src/bench/rpc_blockchain.cpp b/src/bench/rpc_blockchain.cpp index 2fc6f116a4..9e0405f527 100644 --- a/src/bench/rpc_blockchain.cpp +++ b/src/bench/rpc_blockchain.cpp @@ -5,9 +5,9 @@ #include #include -#include -#include #include +#include +#include #include diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index dfa8a6df21..2f7f7fae59 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include -#include #include +#include +#include +#include #include #include -#include #include #include diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp index 3723a48903..846cad1947 100644 --- a/src/test/arith_uint256_tests.cpp +++ b/src/test/arith_uint256_tests.cpp @@ -2,16 +2,16 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include #include -#include -#include +#include #include #include -#include -#include -#include +#include +#include #include #include +#include BOOST_FIXTURE_TEST_SUITE(arith_uint256_tests, BasicTestingSetup) diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp index 690368b177..a30abed379 100644 --- a/src/test/base32_tests.cpp +++ b/src/test/base32_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 #include +#include #include diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp index 94df4d1955..3df244b6ed 100644 --- a/src/test/base64_tests.cpp +++ b/src/test/base64_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 #include +#include #include diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp index 53df032252..e09290d7e1 100644 --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -8,8 +8,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/test/blockchain_tests.cpp b/src/test/blockchain_tests.cpp index aa704642bf..669e6b377b 100644 --- a/src/test/blockchain_tests.cpp +++ b/src/test/blockchain_tests.cpp @@ -8,8 +8,8 @@ #include #include -#include #include +#include /* Equality between doubles is imprecise. Comparison should be done * with a small threshold of tolerance, rather than exact equality. diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index 4a7ad9b38b..8aea7a2be8 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -12,10 +12,10 @@ #include #include #include +#include #include -#include #include -#include +#include #include diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp index a9628e85f9..b815192d09 100644 --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -6,15 +6,15 @@ #include #include -#include -#include +#include #include #include -#include +#include +#include +#include +#include #include #include -#include -#include #include #include diff --git a/src/test/compilerbug_tests.cpp b/src/test/compilerbug_tests.cpp index 1a6fcda009..dcc7c97471 100644 --- a/src/test/compilerbug_tests.cpp +++ b/src/test/compilerbug_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 #include +#include BOOST_FIXTURE_TEST_SUITE(compilerbug_tests, BasicTestingSetup) diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp index 22eae91cf0..998b61a19f 100644 --- a/src/test/compress_tests.cpp +++ b/src/test/compress_tests.cpp @@ -3,8 +3,8 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include #include