From 71a8dbe5da0ec2c17c448eb3303eb30615869813 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Sat, 21 May 2022 13:54:14 -0500
Subject: [PATCH] refactor: Remove defunct attributes.h includes

Since the removal of NODISCARD in 81d5af42f4dba5b68a597536cad7f61894dc22a3,
the only attributes def is LIFETIMEBOUND, and it's included in many more
places that it is used.

This removes all includes which do not have an associated use of LIFETIMEBOUND,
and adds it to the following files, due to their use of the same:
* src/validationinterface.h
* src/script/standard.h
---
 src/base58.h                | 1 -
 src/core_io.h               | 1 -
 src/hash.h                  | 1 -
 src/init.cpp                | 1 -
 src/netaddress.h            | 1 -
 src/node/transaction.h      | 1 -
 src/outputtype.h            | 1 -
 src/psbt.h                  | 1 -
 src/script/standard.h       | 1 +
 src/test/coins_tests.cpp    | 1 -
 src/test/fuzz/util.h        | 1 -
 src/util/bip32.h            | 1 -
 src/util/moneystr.h         | 1 -
 src/util/strencodings.h     | 1 -
 src/util/system.h           | 1 -
 src/validationinterface.cpp | 1 +
 16 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/base58.h b/src/base58.h
index 9ba5af73e05..d2a8d5e3bc4 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -14,7 +14,6 @@
 #ifndef BITCOIN_BASE58_H
 #define BITCOIN_BASE58_H
 
-#include <attributes.h>
 #include <span.h>
 
 #include <string>
diff --git a/src/core_io.h b/src/core_io.h
index aa1381c374f..c91c8199d84 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -6,7 +6,6 @@
 #define BITCOIN_CORE_IO_H
 
 #include <consensus/amount.h>
-#include <attributes.h>
 
 #include <string>
 #include <vector>
diff --git a/src/hash.h b/src/hash.h
index 9f582842c1f..0ccef2105f8 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_HASH_H
 #define BITCOIN_HASH_H
 
-#include <attributes.h>
 #include <crypto/common.h>
 #include <crypto/ripemd160.h>
 #include <crypto/sha256.h>
diff --git a/src/init.cpp b/src/init.cpp
index b1fe9151890..e436d5ea8e1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -86,7 +86,6 @@
 #include <vector>
 
 #ifndef WIN32
-#include <attributes.h>
 #include <cerrno>
 #include <signal.h>
 #include <sys/stat.h>
diff --git a/src/netaddress.h b/src/netaddress.h
index 77e6171054c..47ba0453344 100644
--- a/src/netaddress.h
+++ b/src/netaddress.h
@@ -9,7 +9,6 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <attributes.h>
 #include <compat.h>
 #include <crypto/siphash.h>
 #include <prevector.h>
diff --git a/src/node/transaction.h b/src/node/transaction.h
index b7cf225636d..0604754a464 100644
--- a/src/node/transaction.h
+++ b/src/node/transaction.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_NODE_TRANSACTION_H
 #define BITCOIN_NODE_TRANSACTION_H
 
-#include <attributes.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
 #include <util/error.h>
diff --git a/src/outputtype.h b/src/outputtype.h
index 66fe489bb0a..6b4e6957601 100644
--- a/src/outputtype.h
+++ b/src/outputtype.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_OUTPUTTYPE_H
 #define BITCOIN_OUTPUTTYPE_H
 
-#include <attributes.h>
 #include <script/signingprovider.h>
 #include <script/standard.h>
 
diff --git a/src/psbt.h b/src/psbt.h
index 8a9cbd33d24..8fda889bb4e 100644
--- a/src/psbt.h
+++ b/src/psbt.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_PSBT_H
 #define BITCOIN_PSBT_H
 
-#include <attributes.h>
 #include <node/transaction.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
diff --git a/src/script/standard.h b/src/script/standard.h
index f0b143c52bf..6a15ba4e3d5 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_SCRIPT_STANDARD_H
 #define BITCOIN_SCRIPT_STANDARD_H
 
+#include <attributes.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <uint256.h>
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 82e4e1c90f2..b333a9f72d1 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <attributes.h>
 #include <clientversion.h>
 #include <coins.h>
 #include <script/standard.h>
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 580105e4425..3fc6fa1cd58 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -6,7 +6,6 @@
 #define BITCOIN_TEST_FUZZ_UTIL_H
 
 #include <arith_uint256.h>
-#include <attributes.h>
 #include <chainparamsbase.h>
 #include <coins.h>
 #include <compat.h>
diff --git a/src/util/bip32.h b/src/util/bip32.h
index 8f86f2aaa64..aa4eac3791f 100644
--- a/src/util/bip32.h
+++ b/src/util/bip32.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_UTIL_BIP32_H
 #define BITCOIN_UTIL_BIP32_H
 
-#include <attributes.h>
 #include <string>
 #include <vector>
 
diff --git a/src/util/moneystr.h b/src/util/moneystr.h
index 8180604342f..3d33bd7f995 100644
--- a/src/util/moneystr.h
+++ b/src/util/moneystr.h
@@ -9,7 +9,6 @@
 #ifndef BITCOIN_UTIL_MONEYSTR_H
 #define BITCOIN_UTIL_MONEYSTR_H
 
-#include <attributes.h>
 #include <consensus/amount.h>
 
 #include <optional>
diff --git a/src/util/strencodings.h b/src/util/strencodings.h
index ee583835281..9a96bbe67b9 100644
--- a/src/util/strencodings.h
+++ b/src/util/strencodings.h
@@ -9,7 +9,6 @@
 #ifndef BITCOIN_UTIL_STRENCODINGS_H
 #define BITCOIN_UTIL_STRENCODINGS_H
 
-#include <attributes.h>
 #include <span.h>
 #include <util/string.h>
 
diff --git a/src/util/system.h b/src/util/system.h
index 64585cbfacd..8db3ab9913c 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -14,7 +14,6 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <attributes.h>
 #include <compat.h>
 #include <compat/assumptions.h>
 #include <fs.h>
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index fffab39cc1a..613c5b65ef6 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -5,6 +5,7 @@
 
 #include <validationinterface.h>
 
+#include <attributes.h>
 #include <chain.h>
 #include <consensus/validation.h>
 #include <logging.h>