Merge #12906: Avoid interface keyword to fix windows gitian build

17780d6 scripted-diff: Avoid `interface` keyword to fix windows gitian build (Russell Yanofsky)

Pull request description:

  Rename `interface` to `interfaces`

  Build failure reported by ken2812221 in bitcoin/bitcoin#10244 (comment)

Tree-SHA512: e02c97c728540f344202c13b036f9f63af23bd25e25ed7a5cfe9e2c2f201a12ff232cc94a93fbe37ef6fb6bf9e036fe62210ba798ecd30de191d09338754a8d0

Author: MarcoFalke

doc/developer-notes.md

@@ -623,7 +623,7 @@ GUI
     holds: try to not directly access core data structures from Views.
 
 - Avoid adding slow or blocking code in the GUI thread. In particular do not
-  add new `interface::Node` and `interface::Wallet` method calls, even if they
+  add new `interfaces::Node` and `interfaces::Wallet` method calls, even if they
   may be fast now, in case they are changed to lock or communicate across
   processes in the future.
 

src/Makefile.am

@@ -105,9 +105,9 @@ BITCOIN_CORE_H = \
   httpserver.h \
   indirectmap.h \
   init.h \
-  interface/handler.h \
-  interface/node.h \
-  interface/wallet.h \
+  interfaces/handler.h \
+  interfaces/node.h \
+  interfaces/wallet.h \
   key.h \
   key_io.h \
   keystore.h \
@@ -248,7 +248,7 @@ endif
 libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_wallet_a_SOURCES = \
-  interface/wallet.cpp \
+  interfaces/wallet.cpp \
   wallet/crypter.cpp \
   wallet/db.cpp \
   wallet/feebumper.cpp \
@@ -361,8 +361,8 @@ libbitcoin_util_a_SOURCES = \
   compat/glibcxx_sanity.cpp \
   compat/strnlen.cpp \
   fs.cpp \
-  interface/handler.cpp \
-  interface/node.cpp \
+  interfaces/handler.cpp \
+  interfaces/node.cpp \
   random.cpp \
   rpc/protocol.cpp \
   rpc/util.cpp \

src/interface/README.md renamed to src/interfaces/README.md

@@ -2,15 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <interface/handler.h>
+#include <interfaces/handler.h>
 
 #include <util.h>
 
 #include <boost/signals2/connection.hpp>
 #include <memory>
 #include <utility>
 
-namespace interface {
+namespace interfaces {
 namespace {
 
 class HandlerImpl : public Handler
@@ -30,4 +30,4 @@ std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection)
     return MakeUnique<HandlerImpl>(std::move(connection));
 }
 
-} // namespace interface
+} // namespace interfaces

src/interface/handler.cpp renamed to src/interfaces/handler.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.
 
-#ifndef BITCOIN_INTERFACE_HANDLER_H
-#define BITCOIN_INTERFACE_HANDLER_H
+#ifndef BITCOIN_INTERFACES_HANDLER_H
+#define BITCOIN_INTERFACES_HANDLER_H
 
 #include <memory>
 
@@ -13,7 +13,7 @@ class connection;
 } // namespace signals2
 } // namespace boost
 
-namespace interface {
+namespace interfaces {
 
 //! Generic interface for managing an event handler or callback function
 //! registered with another interface. Has a single disconnect method to cancel
@@ -30,6 +30,6 @@ class Handler
 //! Return handler wrapping a boost signal connection.
 std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection);
 
-} // namespace interface
+} // namespace interfaces
 
-#endif // BITCOIN_INTERFACE_HANDLER_H
+#endif // BITCOIN_INTERFACES_HANDLER_H

src/interface/handler.h renamed to src/interfaces/handler.h

@@ -2,15 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <interface/node.h>
+#include <interfaces/node.h>
 
 #include <addrdb.h>
 #include <amount.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <init.h>
-#include <interface/handler.h>
-#include <interface/wallet.h>
+#include <interfaces/handler.h>
+#include <interfaces/wallet.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netaddress.h>
@@ -43,7 +43,7 @@
 #include <boost/thread/thread.hpp>
 #include <univalue.h>
 
-namespace interface {
+namespace interfaces {
 namespace {
 
 class NodeImpl : public Node
@@ -305,4 +305,4 @@ class NodeImpl : public Node
 
 std::unique_ptr<Node> MakeNode() { return MakeUnique<NodeImpl>(); }
 
-} // namespace interface
+} // namespace interfaces

src/interface/node.cpp renamed to src/interfaces/node.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.
 
-#ifndef BITCOIN_INTERFACE_NODE_H
-#define BITCOIN_INTERFACE_NODE_H
+#ifndef BITCOIN_INTERFACES_NODE_H
+#define BITCOIN_INTERFACES_NODE_H
 
 #include <addrdb.h>     // For banmap_t
 #include <amount.h>     // For CAmount
@@ -29,7 +29,7 @@ class proxyType;
 enum class FeeReason;
 struct CNodeStateStats;
 
-namespace interface {
+namespace interfaces {
 
 class Handler;
 class Wallet;
@@ -254,6 +254,6 @@ class Node
 //! Return implementation of Node interface.
 std::unique_ptr<Node> MakeNode();
 
-} // namespace interface
+} // namespace interfaces
 
-#endif // BITCOIN_INTERFACE_NODE_H
+#endif // BITCOIN_INTERFACES_NODE_H

src/interface/node.h renamed to src/interfaces/node.h

@@ -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 <interface/wallet.h>
+#include <interfaces/wallet.h>
 
 #include <amount.h>
 #include <chain.h>
 #include <consensus/validation.h>
-#include <interface/handler.h>
+#include <interfaces/handler.h>
 #include <net.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
@@ -24,7 +24,7 @@
 
 #include <memory>
 
-namespace interface {
+namespace interfaces {
 namespace {
 
 class PendingWalletTxImpl : public PendingWalletTx
@@ -283,7 +283,7 @@ class WalletImpl : public Wallet
         return result;
     }
     bool tryGetTxStatus(const uint256& txid,
-        interface::WalletTxStatus& tx_status,
+        interfaces::WalletTxStatus& tx_status,
         int& num_blocks,
         int64_t& adjusted_time) override
     {
@@ -438,4 +438,4 @@ class WalletImpl : public Wallet
 
 std::unique_ptr<Wallet> MakeWallet(CWallet& wallet) { return MakeUnique<WalletImpl>(wallet); }
 
-} // namespace interface
+} // namespace interfaces

src/interface/wallet.cpp renamed to src/interfaces/wallet.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.
 
-#ifndef BITCOIN_INTERFACE_WALLET_H
-#define BITCOIN_INTERFACE_WALLET_H
+#ifndef BITCOIN_INTERFACES_WALLET_H
+#define BITCOIN_INTERFACES_WALLET_H
 
 #include <amount.h>                    // For CAmount
 #include <pubkey.h>                    // For CTxDestination (CKeyID and CScriptID)
@@ -27,7 +27,7 @@ class CWallet;
 enum class OutputType;
 struct CRecipient;
 
-namespace interface {
+namespace interfaces {
 
 class Handler;
 class PendingWalletTx;
@@ -347,6 +347,6 @@ struct WalletTxOut
 //! in builds where ENABLE_WALLET is false.
 std::unique_ptr<Wallet> MakeWallet(CWallet& wallet);
 
-} // namespace interface
+} // namespace interfaces
 
-#endif // BITCOIN_INTERFACE_WALLET_H
+#endif // BITCOIN_INTERFACES_WALLET_H

src/interface/wallet.h renamed to src/interfaces/wallet.h

@@ -7,7 +7,7 @@
 #include <qt/guiutil.h>
 #include <qt/walletmodel.h>
 
-#include <interface/node.h>
+#include <interfaces/node.h>
 #include <key_io.h>
 #include <wallet/wallet.h>
 
@@ -74,7 +74,7 @@ class AddressTablePriv
     AddressTablePriv(AddressTableModel *_parent):
         parent(_parent) {}
 
-    void refreshAddressTable(interface::Wallet& wallet)
+    void refreshAddressTable(interfaces::Wallet& wallet)
     {
         cachedAddressTable.clear();
         {