[Build] Unify header file extensions

src/Makefile.am

@@ -131,13 +131,13 @@ LIBSAPLING_H = \
   sapling/sapling_core_write.h \
   sapling/sapling_util.h \
   sapling/prf.h \
-  sapling/noteencryption.hpp \
-  sapling/address.hpp \
-  sapling/note.hpp \
+  sapling/noteencryption.h \
+  sapling/address.h \
+  sapling/note.h \
   sapling/zip32.h \
   sapling/saplingscriptpubkeyman.h \
-  sapling/incrementalmerkletree.hpp \
-  sapling/proof.hpp \
+  sapling/incrementalmerkletree.h \
+  sapling/proof.h \
   sapling/sapling_transaction.h \
   sapling/transaction_builder.h \
   sapling/sapling_operation.h

src/coins.h

@@ -8,10 +8,10 @@
 #define BITCOIN_COINS_H
 
 #include "compressor.h"
+#include "consensus/consensus.h" // can be removed once policy/ established
 #include "memusage.h"
-#include "consensus/consensus.h"  // can be removed once policy/ established
+#include "sapling/incrementalmerkletree.h"
 #include "script/standard.h"
-#include "sapling/incrementalmerkletree.hpp"
 #include "serialize.h"
 #include "uint256.h"
 
@@ -277,7 +277,7 @@ class CCoinsViewCache : public CCoinsViewBacked
 protected:
     /**
      * Make mutable so that we can "fill the cache" even from Get-methods
-     * declared as "const".  
+     * declared as "const".
      */
     mutable uint256 hashBlock;
     mutable CCoinsMap cacheCoins;

src/keystore.h

@@ -9,7 +9,7 @@
 
 #include "key.h"
 #include "pubkey.h"
-#include "sapling/address.hpp"
+#include "sapling/address.h"
 #include "sapling/zip32.h"
 #include "sync.h"
 

src/rpc/rawtransaction.cpp

@@ -20,8 +20,8 @@
 #include "uint256.h"
 #include "utilmoneystr.h"
 #ifdef ENABLE_WALLET
+#include "sapling/address.h"
 #include "sapling/key_io_sapling.h"
-#include "sapling/address.hpp"
 #include "wallet/wallet.h"
 #endif
 

src/sapling/address.cpp

@@ -1,5 +1,5 @@
-#include "sapling/address.hpp"
-#include "sapling/noteencryption.hpp"
+#include "sapling/address.h"
+#include "sapling/noteencryption.h"
 #include "sapling/prf.h"
 #include "sapling/sapling_util.h"
 

src/sapling/incrementalmerkletree.cpp

@@ -5,8 +5,8 @@
 
 #include <stdexcept>
 
-#include "sapling/incrementalmerkletree.hpp"
 #include "crypto/sha256.h"
+#include "sapling/incrementalmerkletree.h"
 #include <librustzcash.h>
 
 namespace libzcash {

src/sapling/note.cpp

@@ -1,4 +1,4 @@
-#include "sapling/note.hpp"
+#include "sapling/note.h"
 
 #include "sapling/prf.h"
 #include "sapling/sapling_util.h"

src/sapling/note.hpp → src/sapling/note.h

@@ -1,10 +1,10 @@
 #ifndef ZC_NOTE_H_
 #define ZC_NOTE_H_
 
-#include "uint256.h"
+#include "sapling/address.h"
+#include "sapling/noteencryption.h"
 #include "sapling/sapling.h"
-#include "sapling/address.hpp"
-#include "sapling/noteencryption.hpp"
+#include "uint256.h"
 
 #include <array>
 #include <boost/optional.hpp>

src/sapling/noteencryption.cpp

@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "sapling/noteencryption.hpp"
+#include "sapling/noteencryption.h"
 
 #include "sapling/prf.h"
 #include "sapling/sapling_util.h"

src/sapling/noteencryption.hpp → src/sapling/noteencryption.h

@@ -13,8 +13,8 @@ See the Zcash protocol specification for more information.
 
 #include "uint256.h"
 
+#include "sapling/address.h"
 #include "sapling/sapling.h"
-#include "sapling/address.hpp"
 
 #include <array>
 

src/sapling/proof.cpp

@@ -1,4 +1,4 @@
-#include "sapling/proof.hpp"
+#include "sapling/proof.h"
 
 namespace libzcash {
 

src/sapling/sapling_transaction.h

@@ -11,9 +11,9 @@
 #include "uint256.h"
 #include "consensus/consensus.h"
 
-#include "sapling/noteencryption.hpp"
+#include "sapling/noteencryption.h"
 #include "sapling/sapling.h"
-#include "sapling/proof.hpp"
+#include "sapling/proof.h"
 
 #include <boost/variant.hpp>
 

src/sapling/saplingscriptpubkeyman.h

@@ -6,11 +6,11 @@
 #define PIVX_SAPLINGSCRIPTPUBKEYMAN_H
 
 #include "consensus/consensus.h"
-#include "sapling/note.hpp"
+#include "sapling/note.h"
 #include "wallet/hdchain.h"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
-#include "sapling/incrementalmerkletree.hpp"
+#include "sapling/incrementalmerkletree.h"
 
 //! Size of witness cache
 //  Should be large enough that we can expect not to reorg beyond our cache

src/sapling/transaction_builder.h

@@ -14,10 +14,10 @@
 #include "script/script.h"
 #include "script/standard.h"
 #include "uint256.h"
-#include "sapling/address.hpp"
-#include "sapling/incrementalmerkletree.hpp"
-#include "sapling/note.hpp"
-#include "sapling/noteencryption.hpp"
+#include "sapling/address.h"
+#include "sapling/incrementalmerkletree.h"
+#include "sapling/note.h"
+#include "sapling/noteencryption.h"
 
 struct SpendDescriptionInfo {
     libzcash::SaplingExpandedSpendingKey expsk;

src/sapling/zip32.h

@@ -10,7 +10,7 @@
 #include "blob_uint256.h"
 #include "key.h"
 #include "uint256.h"
-#include "sapling/address.hpp"
+#include "sapling/address.h"
 
 #include <boost/optional.hpp>
 

src/test/coins_tests.cpp

@@ -12,7 +12,7 @@
 #include "utilstrencodings.h"
 #include "random.h"
 
-#include "sapling/incrementalmerkletree.hpp"
+#include "sapling/incrementalmerkletree.h"
 
 #include <vector>
 #include <map>

src/test/librust/merkletree_tests.cpp

@@ -19,7 +19,7 @@
 #include "serialize.h"
 #include "streams.h"
 
-#include "sapling/incrementalmerkletree.hpp"
+#include "sapling/incrementalmerkletree.h"
 #include "sapling/sapling_util.h"
 
 #include "json_test_vectors.h"

src/test/librust/noteencryption_tests.cpp

@@ -8,12 +8,12 @@
 #include <array>
 #include <stdexcept>
 
-#include "sapling/address.hpp"
-#include "sapling/note.hpp"
-#include "sapling/noteencryption.hpp"
+#include "crypto/sha256.h"
+#include "sapling/address.h"
+#include "sapling/note.h"
+#include "sapling/noteencryption.h"
 #include "sapling/prf.h"
 #include "sapling/sapling_util.h"
-#include "crypto/sha256.h"
 
 #include <boost/test/unit_test.hpp>
 #include <librustzcash.h>

src/test/librust/sapling_key_tests.cpp

@@ -5,10 +5,12 @@
 
 #include "test/test_pivx.h"
 
-#include "sapling/address.hpp"
+#include "sapling/address.h"
 #include "sapling/key_io_sapling.h"
+
 #include <string>
 #include <vector>
+
 #include <boost/test/unit_test.hpp>
 
 

src/test/librust/sapling_keystore_tests.cpp

@@ -6,8 +6,9 @@
 #include "test/test_pivx.h"
 #include "test/librust/utiltest.h"
 
-#include "sapling/address.hpp"
+#include "sapling/address.h"
 #include "sapling/sapling_util.h"
+
 #include <boost/test/unit_test.hpp>
 #include <univalue.h>
 

src/test/librust/sapling_note_tests.cpp

@@ -5,15 +5,16 @@
 
 #include "test/test_pivx.h"
 
-#include "sapling/address.hpp"
-#include "sapling/note.hpp"
+#include "sapling/address.h"
+#include "sapling/note.h"
 #include "sapling/sapling_util.h"
 
 #include "amount.h"
 #include "random.h"
 #include <librustzcash.h>
 
 #include <array>
+
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(sapling_note_tests, BasicTestingSetup)

src/test/librust/sapling_rpc_wallet_tests.cpp

@@ -16,7 +16,7 @@
 #include "wallet/wallet.h"
 
 #include "sapling/key_io_sapling.h"
-#include "sapling/address.hpp"
+#include "sapling/address.h"
 #include "sapling/sapling_operation.h"
 
 #include <unordered_set>

src/test/librust/sapling_wallet_tests.cpp

@@ -18,8 +18,8 @@
 #include "test/librust/utiltest.h"
 #include "wallet/wallet.h"
 #include "consensus/merkle.h"
-#include "sapling/note.hpp"
-#include "sapling/noteencryption.hpp"
+#include "sapling/note.h"
+#include "sapling/noteencryption.h"
 
 #include <boost/filesystem.hpp>
 

src/test/librust/utiltest.h

@@ -6,10 +6,10 @@
 #ifndef PIVX_UTIL_TEST_H
 #define PIVX_UTIL_TEST_H
 
-#include "sapling/address.hpp"
-#include "sapling/incrementalmerkletree.hpp"
-#include "sapling/note.hpp"
-#include "sapling/noteencryption.hpp"
+#include "sapling/address.h"
+#include "sapling/incrementalmerkletree.h"
+#include "sapling/note.h"
+#include "sapling/noteencryption.h"
 #include "wallet/wallet.h"
 
 struct TestSaplingNote {

src/test/librust/wallet_zkeys_tests.cpp

@@ -6,7 +6,7 @@
 #include "wallet/test/wallet_test_fixture.h"
 
 #include "sapling/sapling_util.h"
-#include "sapling/address.hpp"
+#include "sapling/address.h"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
 #include "util.h"

src/validationinterface.h

@@ -8,7 +8,7 @@
 #define BITCOIN_VALIDATIONINTERFACE_H
 
 #include "optional.h"
-#include "sapling/incrementalmerkletree.hpp"
+#include "sapling/incrementalmerkletree.h"
 
 #include <boost/signals2/signal.hpp>
 

src/wallet/test/wallet_shielded_balances_tests.cpp

@@ -7,8 +7,8 @@
 #include "consensus/merkle.h"
 #include "primitives/block.h"
 #include "random.h"
-#include "sapling/note.hpp"
-#include "sapling/noteencryption.hpp"
+#include "sapling/note.h"
+#include "sapling/noteencryption.h"
 #include "sapling/transaction_builder.h"
 #include "test/librust/utiltest.h"
 #include "wallet/wallet.h"

src/wallet/wallet.h

@@ -22,7 +22,7 @@
 #include "policy/feerate.h"
 #include "primitives/block.h"
 #include "primitives/transaction.h"
-#include "sapling/address.hpp"
+#include "sapling/address.h"
 #include "guiinterface.h"
 #include "util.h"
 #include "util/memory.h"