Skip to content

Commit fac5c37

Browse files
author
MarcoFalke
committed
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-
1 parent d8dfcea commit fac5c37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+112
-113
lines changed

Diff for: src/bench/bech32.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <bech32.h>
88
#include <util/strencodings.h>
99

10-
#include <vector>
1110
#include <string>
11+
#include <vector>
1212

1313

1414
static void Bech32Encode(benchmark::State& state)

Diff for: src/bench/bench.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
#ifndef BITCOIN_BENCH_BENCH_H
66
#define BITCOIN_BENCH_BENCH_H
77

8+
#include <chrono>
89
#include <functional>
910
#include <map>
1011
#include <string>
1112
#include <vector>
12-
#include <chrono>
1313

1414
#include <boost/preprocessor/cat.hpp>
1515
#include <boost/preprocessor/stringize.hpp>

Diff for: src/bench/chacha_poly_aead.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <crypto/poly1305.h> // for the POLY1305_TAGLEN constant
99
#include <hash.h>
1010

11-
#include <limits>
1211
#include <assert.h>
12+
#include <limits>
1313

1414
/* Number of bytes to process per iteration */
1515
static constexpr uint64_t BUFFER_SIZE_TINY = 64;

Diff for: src/bench/checkblock.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#include <bench/data.h>
77

88
#include <chainparams.h>
9-
#include <validation.h>
10-
#include <streams.h>
119
#include <consensus/validation.h>
10+
#include <streams.h>
11+
#include <validation.h>
1212

1313
// These are the two major time-sinks which happen after we have fully received
1414
// a block off the wire, but before we can relay the block on to peers using

Diff for: src/bench/checkqueue.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <bench/bench.h>
6-
#include <util/system.h>
6+
#include <boost/thread/thread.hpp>
77
#include <checkqueue.h>
88
#include <prevector.h>
9-
#include <vector>
10-
#include <boost/thread/thread.hpp>
119
#include <random.h>
10+
#include <util/system.h>
11+
#include <vector>
1212

1313

1414
static const int MIN_CORES = 2;

Diff for: src/bench/crypto_hash.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55

66
#include <bench/bench.h>
7-
#include <hash.h>
8-
#include <random.h>
9-
#include <uint256.h>
107
#include <crypto/ripemd160.h>
118
#include <crypto/sha1.h>
129
#include <crypto/sha256.h>
1310
#include <crypto/sha512.h>
1411
#include <crypto/siphash.h>
12+
#include <hash.h>
13+
#include <random.h>
14+
#include <uint256.h>
1515

1616
/* Number of bytes to hash per iteration */
1717
static const uint64_t BUFFER_SIZE = 1000*1000;

Diff for: src/bench/duplicate_inputs.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <validation.h>
1212

1313

14-
1514
static void DuplicateInputs(benchmark::State& state)
1615
{
1716
const CScript SCRIPT_PUB{CScript(OP_TRUE)};

Diff for: src/bench/merkle_root.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#include <bench/bench.h>
66

7-
#include <uint256.h>
8-
#include <random.h>
97
#include <consensus/merkle.h>
8+
#include <random.h>
9+
#include <uint256.h>
1010

1111
static void MerkleRoot(benchmark::State& state)
1212
{

Diff for: src/bench/rpc_blockchain.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <bench/bench.h>
66
#include <bench/data.h>
77

8-
#include <validation.h>
9-
#include <streams.h>
108
#include <rpc/blockchain.h>
9+
#include <streams.h>
10+
#include <validation.h>
1111

1212
#include <univalue.h>
1313

Diff for: src/test/addrman_tests.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44
#include <addrman.h>
5-
#include <test/util/setup_common.h>
6-
#include <string>
75
#include <boost/test/unit_test.hpp>
6+
#include <string>
7+
#include <test/data/asmap.raw.h>
8+
#include <test/util/setup_common.h>
89
#include <util/asmap.h>
910
#include <util/string.h>
10-
#include <test/data/asmap.raw.h>
1111

1212
#include <hash.h>
1313
#include <netbase.h>

Diff for: src/test/arith_uint256_tests.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include <arith_uint256.h>
56
#include <boost/test/unit_test.hpp>
6-
#include <stdint.h>
7-
#include <sstream>
7+
#include <cmath>
88
#include <iomanip>
99
#include <limits>
10-
#include <cmath>
11-
#include <uint256.h>
12-
#include <arith_uint256.h>
10+
#include <sstream>
11+
#include <stdint.h>
1312
#include <string>
1413
#include <test/util/setup_common.h>
14+
#include <uint256.h>
1515

1616
BOOST_FIXTURE_TEST_SUITE(arith_uint256_tests, BasicTestingSetup)
1717

Diff for: src/test/base32_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <util/strencodings.h>
65
#include <test/util/setup_common.h>
6+
#include <util/strencodings.h>
77

88
#include <boost/test/unit_test.hpp>
99

Diff for: src/test/base64_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <util/strencodings.h>
65
#include <test/util/setup_common.h>
6+
#include <util/strencodings.h>
77

88
#include <boost/test/unit_test.hpp>
99

Diff for: src/test/bip32_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <key.h>
99
#include <key_io.h>
1010
#include <streams.h>
11-
#include <util/strencodings.h>
1211
#include <test/util/setup_common.h>
12+
#include <util/strencodings.h>
1313

1414
#include <string>
1515
#include <vector>

Diff for: src/test/blockchain_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#include <chain.h>
1010
#include <rpc/blockchain.h>
11-
#include <util/string.h>
1211
#include <test/util/setup_common.h>
12+
#include <util/string.h>
1313

1414
/* Equality between doubles is imprecise. Comparison should be done
1515
* with a small threshold of tolerance, rather than exact equality.

Diff for: src/test/bloom_tests.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include <random.h>
1313
#include <serialize.h>
1414
#include <streams.h>
15+
#include <test/util/setup_common.h>
1516
#include <uint256.h>
16-
#include <util/system.h>
1717
#include <util/strencodings.h>
18-
#include <test/util/setup_common.h>
18+
#include <util/system.h>
1919

2020
#include <vector>
2121

Diff for: src/test/checkqueue_tests.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
#include <util/system.h>
77
#include <util/time.h>
88

9-
#include <test/util/setup_common.h>
10-
#include <checkqueue.h>
9+
#include <atomic>
1110
#include <boost/test/unit_test.hpp>
1211
#include <boost/thread.hpp>
13-
#include <atomic>
12+
#include <checkqueue.h>
13+
#include <condition_variable>
14+
#include <mutex>
15+
#include <test/util/setup_common.h>
1416
#include <thread>
1517
#include <vector>
16-
#include <mutex>
17-
#include <condition_variable>
1818

1919
#include <unordered_set>
2020
#include <utility>

Diff for: src/test/compilerbug_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <test/util/setup_common.h>
65
#include <boost/test/unit_test.hpp>
6+
#include <test/util/setup_common.h>
77

88
BOOST_FIXTURE_TEST_SUITE(compilerbug_tests, BasicTestingSetup)
99

Diff for: src/test/compress_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <compressor.h>
6-
#include <test/util/setup_common.h>
76
#include <script/standard.h>
7+
#include <test/util/setup_common.h>
88

99
#include <stdint.h>
1010

Diff for: src/test/crypto_tests.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
#include <crypto/aes.h>
66
#include <crypto/chacha20.h>
77
#include <crypto/chacha_poly_aead.h>
8-
#include <crypto/poly1305.h>
98
#include <crypto/hkdf_sha256_32.h>
109
#include <crypto/hmac_sha256.h>
1110
#include <crypto/hmac_sha512.h>
11+
#include <crypto/poly1305.h>
1212
#include <crypto/ripemd160.h>
1313
#include <crypto/sha1.h>
1414
#include <crypto/sha256.h>
1515
#include <crypto/sha512.h>
1616
#include <random.h>
17-
#include <util/strencodings.h>
1817
#include <test/util/setup_common.h>
18+
#include <util/strencodings.h>
1919

2020
#include <vector>
2121

Diff for: src/test/cuckoocache_tests.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44
#include <boost/test/unit_test.hpp>
55
#include <cuckoocache.h>
6+
#include <deque>
7+
#include <random.h>
68
#include <script/sigcache.h>
79
#include <test/util/setup_common.h>
8-
#include <random.h>
910
#include <thread>
10-
#include <deque>
1111

1212
/** Test Suite for CuckooCache
1313
*

Diff for: src/test/dbwrapper_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <dbwrapper.h>
6-
#include <uint256.h>
76
#include <test/util/setup_common.h>
7+
#include <uint256.h>
88
#include <util/memory.h>
99

1010
#include <memory>

Diff for: src/test/descriptor_tests.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <vector>
6-
#include <string>
5+
#include <boost/test/unit_test.hpp>
6+
#include <script/descriptor.h>
77
#include <script/sign.h>
88
#include <script/standard.h>
9+
#include <string>
910
#include <test/util/setup_common.h>
10-
#include <boost/test/unit_test.hpp>
11-
#include <script/descriptor.h>
1211
#include <util/strencodings.h>
12+
#include <vector>
1313

1414
namespace {
1515

Diff for: src/test/fuzz/base_encode_decode.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include <base58.h>
88
#include <psbt.h>
9-
#include <util/string.h>
109
#include <util/strencodings.h>
10+
#include <util/string.h>
1111

1212
#include <cassert>
1313
#include <cstdint>

Diff for: src/test/fuzz/block.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <consensus/validation.h>
88
#include <core_io.h>
99
#include <core_memusage.h>
10-
#include <pubkey.h>
1110
#include <primitives/block.h>
11+
#include <pubkey.h>
1212
#include <streams.h>
1313
#include <test/fuzz/fuzz.h>
1414
#include <validation.h>

Diff for: src/test/fuzz/eval_script.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include <pubkey.h>
66
#include <script/interpreter.h>
7-
#include <test/fuzz/fuzz.h>
87
#include <test/fuzz/FuzzedDataProvider.h>
8+
#include <test/fuzz/fuzz.h>
99
#include <util/memory.h>
1010

1111
#include <limits>

Diff for: src/test/fuzz/hex.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <core_io.h>
6-
#include <pubkey.h>
76
#include <primitives/block.h>
7+
#include <pubkey.h>
88
#include <rpc/util.h>
99
#include <test/fuzz/fuzz.h>
1010
#include <uint256.h>

Diff for: src/test/fuzz/prevector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <test/fuzz/fuzz.h>
65
#include <test/fuzz/FuzzedDataProvider.h>
6+
#include <test/fuzz/fuzz.h>
77

8-
#include <vector>
98
#include <prevector.h>
9+
#include <vector>
1010

1111
#include <reverse_iterator.h>
1212
#include <serialize.h>

Diff for: src/test/getarg_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include <test/util/setup_common.h>
56
#include <util/strencodings.h>
67
#include <util/system.h>
7-
#include <test/util/setup_common.h>
88

99
#include <string>
1010
#include <utility>

Diff for: src/test/hash_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include <clientversion.h>
66
#include <crypto/siphash.h>
77
#include <hash.h>
8-
#include <util/strencodings.h>
98
#include <test/util/setup_common.h>
9+
#include <util/strencodings.h>
1010

1111
#include <boost/test/unit_test.hpp>
1212

Diff for: src/test/key_io_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <key.h>
99
#include <key_io.h>
1010
#include <script/script.h>
11-
#include <util/strencodings.h>
1211
#include <test/util/setup_common.h>
12+
#include <util/strencodings.h>
1313

1414
#include <boost/test/unit_test.hpp>
1515

0 commit comments

Comments
 (0)