From 4aa197dbdbfd570dbe77953d509fc180e008dc7a Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Thu, 17 Aug 2023 00:27:31 +0700 Subject: [PATCH] Merge #18673: scripted-diff: Sort test includes fa4632c41714dfaa699bacc6a947d72668a4deef test: Move boost/stdlib includes last (MarcoFalke) fa488f131fd4f5bab0d01376c5a5013306f1abcd scripted-diff: Bump copyright headers (MarcoFalke) fac5c373006a9e4bcbb56843bb85f1aca4d87599 scripted-diff: Sort test includes (MarcoFalke) Pull request description: When writing tests, often includes need to be added or removed. Currently the list of includes is not sorted, so developers that write tests and have `clang-format` installed will either have an unrelated change (sorting) included in their commit or they will have to manually undo the sort. This pull preempts both issues by just sorting all includes in one commit. Please be aware that this is **NOT** a change to policy to enforce clang-format or any other developer guideline or process. Developers are free to use whatever tool they want, see also #18651. Edit: Also includes a commit to bump the copyright headers, so that the touched files don't need to be touched again for that. ACKs for top commit: practicalswift: ACK fa4632c41714dfaa699bacc6a947d72668a4deef jonatack: ACK fa4632c41714dfaa, light review and sanity checks with gcc build and clang fuzz build Tree-SHA512: 130a8d073a379ba556b1e64104d37c46b671425c0aef0ed725fd60156a95e8dc83fb6f0b5330b2f8152cf5daaf3983b4aca5e75812598f2626c39fd12b88b180 --- ci/test/00_setup_env.sh | 2 +- ci/test/00_setup_env_arm.sh | 2 +- ci/test/00_setup_env_mac.sh | 2 +- ci/test/00_setup_env_mac_host.sh | 2 +- ci/test/00_setup_env_native_asan.sh | 2 +- ci/test/00_setup_env_native_fuzz.sh | 2 +- .../00_setup_env_native_fuzz_with_valgrind.sh | 2 +- ci/test/00_setup_env_native_nowallet.sh | 2 +- ci/test/00_setup_env_native_qt5.sh | 2 +- ci/test/00_setup_env_native_tsan.sh | 2 +- ci/test/00_setup_env_native_valgrind.sh | 2 +- ci/test/00_setup_env_s390x.sh | 2 +- ci/test/00_setup_env_s390x_host.sh | 2 +- ci/test/00_setup_env_win64.sh | 2 +- ci/test/05_before_script.sh | 2 +- contrib/devtools/circular-dependencies.py | 2 +- contrib/devtools/copyright_header.py | 2 +- contrib/devtools/test-security-check.py | 2 +- contrib/devtools/test_deterministic_coverage.sh | 2 +- contrib/filter-lcov.py | 2 +- contrib/linearize/linearize-data.py | 2 +- contrib/seeds/makeseeds.py | 2 +- contrib/verify-commits/pre-push-hook.sh | 2 +- src/addrman.cpp | 2 +- src/bench/bech32.cpp | 4 ++-- src/bench/bench.cpp | 2 +- src/bench/bench.h | 2 +- src/bench/block_assemble.cpp | 2 +- src/bench/bls.cpp | 2 +- src/bench/ccoins_caching.cpp | 2 +- src/bench/chacha_poly_aead.cpp | 4 ++-- src/bench/checkblock.cpp | 6 +++--- src/bench/checkqueue.cpp | 4 ++-- src/bench/duplicate_inputs.cpp | 3 +-- src/bench/examples.cpp | 2 +- src/bench/merkle_root.cpp | 6 +++--- src/bench/rpc_blockchain.cpp | 6 +++--- src/bench/string_cast.cpp | 2 +- src/bench/verify_script.cpp | 2 +- src/bench/wallet_balance.cpp | 2 +- src/bitcoin-cli.cpp | 2 +- src/bitcoin-tx.cpp | 2 +- src/bitcoin-wallet.cpp | 2 +- src/bitcoind.cpp | 2 +- src/blockencodings.h | 2 +- src/chain.h | 2 +- src/chainparams.cpp | 2 +- src/chainparams.h | 2 +- src/checkqueue.h | 2 +- src/coins.h | 2 +- src/compressor.h | 2 +- src/consensus/merkle.cpp | 2 +- src/core_read.cpp | 2 +- src/flatfile.h | 2 +- src/httprpc.cpp | 2 +- src/httpserver.cpp | 2 +- src/httpserver.h | 2 +- src/index/base.cpp | 2 +- src/index/base.h | 2 +- src/indirectmap.h | 2 +- src/init.h | 2 +- src/interfaces/handler.cpp | 2 +- src/interfaces/handler.h | 2 +- src/interfaces/wallet.h | 2 +- src/logging/timer.h | 2 +- src/memusage.h | 2 +- src/miner.cpp | 2 +- src/miner.h | 2 +- src/net_permissions.h | 2 +- src/netaddress.cpp | 2 +- src/netaddress.h | 2 +- src/node/coinstats.cpp | 2 +- src/node/context.cpp | 2 +- src/node/context.h | 2 +- src/node/transaction.h | 2 +- src/outputtype.cpp | 2 +- src/prevector.h | 2 +- src/primitives/transaction.cpp | 2 +- src/protocol.cpp | 2 +- src/psbt.cpp | 2 +- src/psbt.h | 2 +- src/qt/addresstablemodel.cpp | 2 +- src/qt/bantablemodel.cpp | 2 +- src/qt/bantablemodel.h | 2 +- src/qt/bitcoingui.h | 2 +- src/qt/clientmodel.cpp | 2 +- src/qt/coincontroltreewidget.h | 2 +- src/qt/csvmodelwriter.h | 2 +- src/qt/guiutil.cpp | 2 +- src/qt/macnotificationhandler.mm | 2 +- src/qt/main.cpp | 2 +- src/qt/modaloverlay.cpp | 2 +- src/qt/peertablemodel.cpp | 2 +- src/qt/peertablemodel.h | 2 +- src/qt/qvaluecombobox.h | 2 +- src/qt/rpcconsole.cpp | 2 +- src/qt/sendcoinsdialog.cpp | 2 +- src/qt/signverifymessagedialog.cpp | 2 +- src/qt/splashscreen.cpp | 2 +- src/qt/test/addressbooktests.cpp | 2 +- src/qt/test/apptests.cpp | 2 +- src/qt/test/apptests.h | 2 +- src/qt/test/util.cpp | 2 +- src/qt/test/util.h | 2 +- src/qt/test/wallettests.cpp | 2 +- src/qt/trafficgraphwidget.h | 2 +- src/qt/transactiondescdialog.h | 2 +- src/qt/utilitydialog.cpp | 2 +- src/qt/utilitydialog.h | 2 +- src/qt/walletcontroller.cpp | 2 +- src/qt/walletcontroller.h | 2 +- src/qt/walletmodel.cpp | 2 +- src/qt/walletmodel.h | 2 +- src/qt/walletview.cpp | 2 +- src/qt/walletview.h | 2 +- src/random.cpp | 2 +- src/random.h | 2 +- src/randomenv.cpp | 2 +- src/rpc/blockchain.cpp | 2 +- src/rpc/client.cpp | 2 +- src/rpc/misc.cpp | 2 +- src/rpc/net.cpp | 2 +- src/rpc/rawtransaction.cpp | 2 +- src/rpc/rawtransaction_util.cpp | 2 +- src/rpc/rawtransaction_util.h | 2 +- src/rpc/util.cpp | 2 +- src/rpc/util.h | 2 +- src/scheduler.cpp | 2 +- src/script/descriptor.cpp | 2 +- src/script/descriptor.h | 2 +- src/script/interpreter.cpp | 2 +- src/script/script.h | 2 +- src/script/script_error.cpp | 2 +- src/script/sign.cpp | 2 +- src/script/sign.h | 2 +- src/serialize.h | 2 +- src/span.h | 2 +- src/support/lockedpool.cpp | 2 +- src/test/addrman_tests.cpp | 10 +++++----- src/test/arith_uint256_tests.cpp | 16 +++++++++------- src/test/base32_tests.cpp | 4 ++-- src/test/base64_tests.cpp | 4 ++-- src/test/bip32_tests.cpp | 4 ++-- src/test/bip39_tests.cpp | 4 ++-- src/test/block_reward_reallocation_tests.cpp | 6 +++--- src/test/blockchain_tests.cpp | 4 ++-- src/test/blockfilter_index_tests.cpp | 4 ++-- src/test/bloom_tests.cpp | 4 ++-- src/test/bls_tests.cpp | 2 +- src/test/bswap_tests.cpp | 2 +- src/test/checkqueue_tests.cpp | 2 +- src/test/compilerbug_tests.cpp | 4 ++-- src/test/compress_tests.cpp | 4 ++-- src/test/crypto_tests.cpp | 8 ++++---- src/test/cuckoocache_tests.cpp | 2 +- src/test/dbwrapper_tests.cpp | 4 ++-- src/test/descriptor_tests.cpp | 12 +++++++----- src/test/dynamic_activation_thresholds_tests.cpp | 2 +- src/test/evo_deterministicmns_tests.cpp | 4 ++-- src/test/evo_mnhf_tests.cpp | 2 +- src/test/evo_trivialvalidation.cpp | 2 +- src/test/evo_utils_tests.cpp | 2 +- src/test/fuzz/asmap_direct.cpp | 2 +- src/test/fuzz/base_encode_decode.cpp | 4 ++-- src/test/fuzz/block.cpp | 4 ++-- src/test/fuzz/descriptor_parse.cpp | 2 +- src/test/fuzz/deserialize.cpp | 2 +- src/test/fuzz/eval_script.cpp | 4 ++-- src/test/fuzz/fuzz.cpp | 2 +- src/test/fuzz/hex.cpp | 4 ++-- src/test/fuzz/integer.cpp | 2 +- src/test/fuzz/parse_univalue.cpp | 4 ++-- src/test/fuzz/prevector.cpp | 4 ++-- src/test/fuzz/process_messages.cpp | 2 +- src/test/fuzz/psbt.cpp | 4 ++-- src/test/fuzz/script.cpp | 2 +- src/test/fuzz/script_flags.cpp | 2 +- src/test/fuzz/signature_checker.cpp | 2 +- src/test/fuzz/transaction.cpp | 2 +- src/test/fuzz/util.h | 2 +- src/test/getarg_tests.cpp | 4 ++-- src/test/governance_validators_tests.cpp | 2 +- src/test/hash_tests.cpp | 4 ++-- src/test/key_io_tests.cpp | 4 ++-- src/test/key_tests.cpp | 6 +++--- src/test/main.cpp | 2 +- src/test/mempool_tests.cpp | 2 +- src/test/merkleblock_tests.cpp | 4 ++-- src/test/miner_tests.cpp | 2 +- src/test/multisig_tests.cpp | 6 +++--- src/test/net_tests.cpp | 16 ++++++++-------- src/test/netbase_tests.cpp | 4 ++-- src/test/pmt_tests.cpp | 8 ++++---- src/test/policyestimator_tests.cpp | 2 +- src/test/prevector_tests.cpp | 4 ++-- src/test/random_tests.cpp | 2 +- src/test/reverselock_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 | 8 ++++---- src/test/scriptnum10.h | 4 ++-- src/test/scriptnum_tests.cpp | 4 ++-- src/test/serialize_tests.cpp | 4 ++-- src/test/settings_tests.cpp | 2 +- src/test/sighash_tests.cpp | 4 ++-- src/test/sigopcount_tests.cpp | 6 +++--- src/test/timedata_tests.cpp | 4 ++-- src/test/transaction_tests.cpp | 10 +++++----- src/test/txindex_tests.cpp | 2 +- src/test/txvalidation_tests.cpp | 4 ++-- src/test/txvalidationcache_tests.cpp | 6 +++--- src/test/uint256_tests.cpp | 7 ++++--- src/test/util/mining.cpp | 4 ++-- src/test/util/setup_common.cpp | 12 ++++++------ src/test/util/setup_common.h | 2 +- src/test/util/transaction_utils.cpp | 4 ++-- src/test/util/transaction_utils.h | 2 +- src/test/util_tests.cpp | 2 +- src/test/util_threadnames_tests.cpp | 8 ++++---- src/test/validation_block_tests.cpp | 4 ++-- src/test/validation_chainstate_tests.cpp | 6 +++--- src/test/validation_chainstatemanager_tests.cpp | 5 ++--- src/test/validation_flush_tests.cpp | 4 ++-- src/test/versionbits_tests.cpp | 8 ++++---- src/txdb.cpp | 2 +- src/txmempool.cpp | 2 +- src/undo.h | 2 +- src/util/asmap.cpp | 2 +- src/util/bip32.cpp | 2 +- src/util/bip32.h | 2 +- src/util/moneystr.cpp | 2 +- src/util/moneystr.h | 2 +- src/util/strencodings.cpp | 2 +- src/util/strencodings.h | 2 +- src/util/time.cpp | 2 +- src/util/time.h | 2 +- src/util/url.h | 2 +- src/wallet/db.h | 2 +- src/wallet/init.cpp | 2 +- src/wallet/interfaces.cpp | 2 +- src/wallet/load.cpp | 2 +- src/wallet/rpcdump.cpp | 2 +- src/wallet/rpcwallet.h | 2 +- src/wallet/scriptpubkeyman.cpp | 2 +- src/wallet/test/coinjoin_tests.cpp | 4 ++-- src/wallet/test/coinselector_tests.cpp | 10 +++++----- src/wallet/test/psbt_wallet_tests.cpp | 2 +- src/wallet/test/wallet_test_fixture.cpp | 2 +- src/wallet/test/wallet_test_fixture.h | 2 +- src/wallet/test/wallet_tests.cpp | 6 +++--- src/wallet/walletdb.cpp | 2 +- src/wallet/walletdb.h | 2 +- src/wallet/wallettool.cpp | 2 +- src/zmq/zmqrpc.cpp | 2 +- test/functional/data/invalid_txs.py | 2 +- test/functional/feature_abortnode.py | 2 +- test/functional/feature_assumevalid.py | 2 +- test/functional/feature_block.py | 2 +- test/functional/feature_cltv.py | 2 +- test/functional/feature_csv_activation.py | 2 +- test/functional/feature_dersig.py | 2 +- test/functional/feature_fee_estimation.py | 2 +- test/functional/feature_filelock.py | 2 +- test/functional/feature_help.py | 2 +- test/functional/feature_loadblock.py | 2 +- test/functional/feature_logging.py | 2 +- test/functional/feature_maxuploadtarget.py | 2 +- test/functional/feature_nulldummy.py | 2 +- test/functional/feature_pruning.py | 2 +- test/functional/interface_bitcoin_cli.py | 2 +- test/functional/interface_rpc.py | 2 +- test/functional/mempool_accept.py | 2 +- test/functional/mempool_persist.py | 2 +- test/functional/mempool_reorg.py | 2 +- test/functional/mining_basic.py | 2 +- test/functional/p2p_invalid_block.py | 2 +- test/functional/p2p_invalid_locator.py | 2 +- test/functional/p2p_invalid_messages.py | 2 +- test/functional/p2p_invalid_tx.py | 2 +- test/functional/p2p_leak.py | 2 +- test/functional/p2p_leak_tx.py | 2 +- test/functional/p2p_permissions.py | 2 +- test/functional/p2p_sendheaders.py | 2 +- test/functional/p2p_timeouts.py | 2 +- test/functional/p2p_tx_download.py | 2 +- test/functional/p2p_unrequested_blocks.py | 2 +- test/functional/rpc_blockchain.py | 2 +- test/functional/rpc_dumptxoutset.py | 2 +- test/functional/rpc_estimatefee.py | 2 +- test/functional/rpc_fundrawtransaction.py | 2 +- .../rpc_getaddressinfo_label_deprecation.py | 2 +- test/functional/rpc_psbt.py | 2 +- test/functional/rpc_scantxoutset.py | 2 +- test/functional/rpc_signrawtransaction.py | 2 +- test/functional/test_framework/address.py | 2 +- test/functional/test_framework/messages.py | 2 +- test/functional/test_framework/mininode.py | 2 +- test/functional/test_framework/script.py | 2 +- test/functional/test_framework/test_node.py | 2 +- test/functional/test_framework/util.py | 2 +- test/functional/test_runner.py | 2 +- test/functional/tool_wallet.py | 2 +- test/functional/wallet_abandonconflict.py | 2 +- test/functional/wallet_backup.py | 2 +- test/functional/wallet_balance.py | 2 +- test/functional/wallet_createwallet.py | 2 +- test/functional/wallet_dump.py | 2 +- test/functional/wallet_groups.py | 2 +- test/functional/wallet_hd.py | 2 +- test/functional/wallet_multiwallet.py | 2 +- .../wallet_resendwallettransactions.py | 2 +- test/fuzz/test_runner.py | 2 +- test/lint/extended-lint-all.sh | 2 +- test/lint/extended-lint-cppcheck.sh | 2 +- test/lint/lint-circular-dependencies.sh | 2 +- test/lint/lint-format-strings.sh | 2 +- test/lint/lint-includes.sh | 2 +- test/lint/lint-locale-dependence.sh | 2 +- test/lint/lint-python-utf8-encoding.sh | 2 +- test/lint/lint-shebang.sh | 2 +- test/lint/lint-shell.sh | 2 +- 322 files changed, 438 insertions(+), 435 deletions(-) diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index 9c0c33c8e0..3311a78524 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh index 743fbb9558..ccffcc931c 100755 --- a/ci/test/00_setup_env_arm.sh +++ b/ci/test/00_setup_env_arm.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index 317ad67c01..befdb2dbab 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh index 3ff94c65a8..177c87e1cc 100755 --- a/ci/test/00_setup_env_mac_host.sh +++ b/ci/test/00_setup_env_mac_host.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh index 0e15669347..29af9e8a58 100644 --- a/ci/test/00_setup_env_native_asan.sh +++ b/ci/test/00_setup_env_native_asan.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh index 2f6ad69d9a..92001c8860 100755 --- a/ci/test/00_setup_env_native_fuzz.sh +++ b/ci/test/00_setup_env_native_fuzz.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh index 395ae7c9ec..9805ccf12b 100644 --- a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh +++ b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_native_nowallet.sh b/ci/test/00_setup_env_native_nowallet.sh index 832884f0de..aca3c936c7 100755 --- a/ci/test/00_setup_env_native_nowallet.sh +++ b/ci/test/00_setup_env_native_nowallet.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh index 3727fb9aea..2db104e35d 100755 --- a/ci/test/00_setup_env_native_qt5.sh +++ b/ci/test/00_setup_env_native_qt5.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index 29c217bf80..60b2eaab6b 100755 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_native_valgrind.sh b/ci/test/00_setup_env_native_valgrind.sh index a86b4b3255..9067e80df9 100644 --- a/ci/test/00_setup_env_native_valgrind.sh +++ b/ci/test/00_setup_env_native_valgrind.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index dbf3fbfd1e..de73da937c 100644 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_s390x_host.sh b/ci/test/00_setup_env_s390x_host.sh index 8f3063604e..3e31867f2f 100644 --- a/ci/test/00_setup_env_s390x_host.sh +++ b/ci/test/00_setup_env_s390x_host.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index b19876bece..9014e9a2f1 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh index 6575161739..119b74c5a4 100755 --- a/ci/test/05_before_script.sh +++ b/ci/test/05_before_script.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/devtools/circular-dependencies.py b/contrib/devtools/circular-dependencies.py index 50a2705d89..e3ad131361 100755 --- a/contrib/devtools/circular-dependencies.py +++ b/contrib/devtools/circular-dependencies.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018-2019 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index 2c112feabe..e6efff75fd 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2019 The Bitcoin Core developers +# Copyright (c) 2016-2020 The Bitcoin Core developers # Copyright (c) 2019-2023 The Dash Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py index 46839a0c49..fc8dd92057 100755 --- a/contrib/devtools/test-security-check.py +++ b/contrib/devtools/test-security-check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2016 The Bitcoin Core developers +# Copyright (c) 2015-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/devtools/test_deterministic_coverage.sh b/contrib/devtools/test_deterministic_coverage.sh index 0ce0d3261b..246378cd00 100755 --- a/contrib/devtools/test_deterministic_coverage.sh +++ b/contrib/devtools/test_deterministic_coverage.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/filter-lcov.py b/contrib/filter-lcov.py index 75034616f7..e005cb96da 100755 --- a/contrib/filter-lcov.py +++ b/contrib/filter-lcov.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2019 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py index 848b0a4f33..aa338ea758 100755 --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -2,7 +2,7 @@ # # linearize-data.py: Construct a linear, no-fork version of the chain. # -# Copyright (c) 2013-2014 The Bitcoin Core developers +# Copyright (c) 2013-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index e1aef34e85..3b0d7e2d26 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/verify-commits/pre-push-hook.sh b/contrib/verify-commits/pre-push-hook.sh index 204f52f176..31a6996b68 100755 --- a/contrib/verify-commits/pre-push-hook.sh +++ b/contrib/verify-commits/pre-push-hook.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2014-2019 The Bitcoin Core developers +# Copyright (c) 2014-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrman.cpp b/src/addrman.cpp index b850488869..ec1b0fcc7d 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012 Pieter Wuille -// Copyright (c) 2012-2015 The Bitcoin Core developers +// Copyright (c) 2012-2020 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bech32.cpp b/src/bench/bech32.cpp index d2b329032c..d7cab208fc 100644 --- a/src/bench/bech32.cpp +++ b/src/bench/bech32.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018-2020 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -7,8 +7,8 @@ #include #include -#include #include +#include static void Bech32Encode(benchmark::Bench& bench) diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index c168b1c481..e262da5d44 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Bitcoin Core developers +// Copyright (c) 2015-2020 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench.h b/src/bench/bench.h index 5889d16c87..bafc7f8716 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/block_assemble.cpp b/src/bench/block_assemble.cpp index c173f4de75..736f834453 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -7,8 +7,8 @@ #include #include