Replace includes of boost/filesystem.h with fs.h

This is step one in abstracting the use of boost::filesystem.

src/bench/bench_bitcoin.cpp

@@ -4,12 +4,11 @@
 
 #include "bench.h"
 
+#include "fs.h"
 #include "key.h"
 #include "main.h"
 #include "util.h"
 
-#include <boost/filesystem.hpp>
-
 #include "librustzcash.h"
 
 int

src/bitcoin-cli.cpp

@@ -5,12 +5,12 @@
 
 #include "chainparamsbase.h"
 #include "clientversion.h"
+#include "fs.h"
 #include "rpc/client.h"
 #include "rpc/protocol.h"
 #include "util.h"
 #include "utilstrencodings.h"
 
-#include <boost/filesystem/operations.hpp>
 #include <stdio.h>
 
 #include <event2/buffer.h>

src/bitcoind.cpp

@@ -4,6 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "clientversion.h"
+#include "fs.h"
 #include "rpc/server.h"
 #include "init.h"
 #include "main.h"
@@ -14,7 +15,6 @@
 #include "httprpc.h"
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 
 #include <stdio.h>

src/dbwrapper.cpp

@@ -4,10 +4,9 @@
 
 #include "dbwrapper.h"
 
+#include "fs.h"
 #include "util.h"
 
-#include <boost/filesystem.hpp>
-
 #include <leveldb/cache.h>
 #include <leveldb/env.h>
 #include <leveldb/filter_policy.h>

src/dbwrapper.h

@@ -6,13 +6,12 @@
 #define BITCOIN_DBWRAPPER_H
 
 #include "clientversion.h"
+#include "fs.h"
 #include "serialize.h"
 #include "streams.h"
 #include "util.h"
 #include "version.h"
 
-#include <boost/filesystem/path.hpp>
-
 #include <leveldb/db.h>
 #include <leveldb/write_batch.h>
 

src/gtest/test_deprecation.cpp

@@ -4,6 +4,7 @@
 #include "chainparams.h"
 #include "clientversion.h"
 #include "deprecation.h"
+#include "fs.h"
 #include "init.h"
 #include "ui_interface.h"
 #include "util.h"
@@ -11,7 +12,6 @@
 
 #include "test/testutil.h"
 
-#include <boost/filesystem/operations.hpp>
 #include <fstream>
 
 using namespace boost::placeholders;

src/gtest/test_foundersreward.cpp

@@ -4,6 +4,7 @@
 #include "utilmoneystr.h"
 #include "chainparams.h"
 #include "consensus/funding.h"
+#include "fs.h"
 #include "key_io.h"
 #include "utilstrencodings.h"
 #include "zcash/Address.hpp"
@@ -13,7 +14,6 @@
 #include <string>
 #include <set>
 #include <vector>
-#include <boost/filesystem.hpp>
 #include "util.h"
 #include "utiltest.h"
 

src/init.cpp

@@ -16,6 +16,7 @@
 #include "consensus/upgrades.h"
 #include "consensus/validation.h"
 #include "experimental_features.h"
+#include "fs.h"
 #include "httpserver.h"
 #include "httprpc.h"
 #include "key.h"

src/logging.cpp

@@ -6,12 +6,12 @@
 
 #include "logging.h"
 
+#include "fs.h"
 #include "serialize.h"
 #include "util.h"
 
 #include <set>
 
-#include <boost/filesystem/operations.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/once.hpp>
 #include <boost/thread/tss.hpp>

src/logging.h

@@ -7,13 +7,12 @@
 #ifndef ZCASH_LOGGING_H
 #define ZCASH_LOGGING_H
 
+#include "fs.h"
 #include "tinyformat.h"
 
 #include <atomic>
 #include <string>
 
-#include <boost/filesystem/path.hpp>
-
 #include <tracing.h>
 
 static const bool DEFAULT_LOGTIMEMICROS = false;

src/main.cpp

@@ -42,8 +42,6 @@
 #include <sstream>
 
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
 #include <boost/math/distributions/poisson.hpp>
 #include <boost/thread.hpp>
 #include <boost/static_assert.hpp>

src/main.h

@@ -15,6 +15,7 @@
 #include "chainparams.h"
 #include "coins.h"
 #include "consensus/upgrades.h"
+#include "fs.h"
 #include "net.h"
 #include "primitives/block.h"
 #include "primitives/transaction.h"

src/net.cpp

@@ -7,6 +7,7 @@
 #include "config/bitcoin-config.h"
 #endif
 
+#include "fs.h"
 #include "main.h"
 #include "net.h"
 
@@ -24,7 +25,6 @@
 #include <fcntl.h>
 #endif
 
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 
 // Dump addresses to peers.dat every 15 minutes (900s)

src/net.h

@@ -8,6 +8,7 @@
 
 #include "bloom.h"
 #include "compat.h"
+#include "fs.h"
 #include "hash.h"
 #include "limitedmap.h"
 #include "mruset.h"
@@ -26,7 +27,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include <boost/filesystem/path.hpp>
 #include <boost/foreach.hpp>
 #include <boost/signals2/signal.hpp>
 

src/rpc/protocol.h

@@ -6,11 +6,12 @@
 #ifndef BITCOIN_RPCPROTOCOL_H
 #define BITCOIN_RPCPROTOCOL_H
 
+#include "fs.h"
+
 #include <list>
 #include <map>
 #include <stdint.h>
 #include <string>
-#include <boost/filesystem.hpp>
 
 #include <univalue.h>
 

src/rpc/server.cpp

@@ -5,6 +5,7 @@
 
 #include "rpc/server.h"
 
+#include "fs.h"
 #include "init.h"
 #include "key_io.h"
 #include "random.h"
@@ -19,7 +20,6 @@
 #include <univalue.h>
 
 #include <boost/bind/bind.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <boost/iostreams/concepts.hpp>
 #include <boost/iostreams/stream.hpp>

src/test/alert_tests.cpp

@@ -10,6 +10,7 @@
 #include "chain.h"
 #include "chainparams.h"
 #include "clientversion.h"
+#include "fs.h"
 #include "test/data/alertTests.raw.h"
 
 #include "main.h"
@@ -26,7 +27,6 @@
 
 #include <fstream>
 
-#include <boost/filesystem/operations.hpp>
 #include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 

src/test/checkblock_tests.cpp

@@ -4,6 +4,7 @@
 
 #include "clientversion.h"
 #include "consensus/validation.h"
+#include "fs.h"
 #include "main.h"
 #include "proof_verifier.h"
 #include "test/test_bitcoin.h"
@@ -12,8 +13,6 @@
 
 #include <cstdio>
 
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
 #include <boost/test/unit_test.hpp>
 
 

src/test/streams_tests.cpp

@@ -2,12 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
+#include "fs.h"
 #include "main.h"
 #include "test/test_bitcoin.h"
 #include "test/test_random.h"
 
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(streams_tests, TestingSetup)
 

src/test/test_bitcoin.cpp

@@ -14,6 +14,7 @@
 #ifdef ENABLE_MINING
 #include "crypto/equihash.h"
 #endif
+#include "fs.h"
 #include "key.h"
 #include "main.h"
 #include "miner.h"
@@ -27,7 +28,6 @@
 
 #include "test/testutil.h"
 
-#include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 

src/test/test_bitcoin.h

@@ -3,11 +3,11 @@
 
 #include "chainparamsbase.h"
 #include "consensus/upgrades.h"
+#include "fs.h"
 #include "key.h"
 #include "pubkey.h"
 #include "txdb.h"
 
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 
 /** Basic testing setup.

src/test/testutil.cpp

@@ -8,7 +8,7 @@
 #include <shlobj.h>
 #endif
 
-#include <boost/filesystem.hpp>
+#include "fs.h"
 
 boost::filesystem::path GetTempPath() {
 #if BOOST_FILESYSTEM_VERSION == 3

src/test/testutil.h

@@ -8,7 +8,7 @@
 #ifndef BITCOIN_TEST_TESTUTIL_H
 #define BITCOIN_TEST_TESTUTIL_H
 
-#include <boost/filesystem/path.hpp>
+#include "fs.h"
 
 boost::filesystem::path GetTempPath();
 

src/util.cpp

@@ -11,6 +11,7 @@
 #include "util.h"
 
 #include "chainparamsbase.h"
+#include "fs.h"
 #include "random.h"
 #include "serialize.h"
 #include "sync.h"
@@ -77,8 +78,6 @@
 #include <boost/algorithm/string/case_conv.hpp> // for to_lower()
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
 #include <boost/foreach.hpp>
 #include <boost/program_options/detail/config_file.hpp>
 #include <boost/program_options/parsers.hpp>

src/util.h

@@ -15,6 +15,7 @@
 #endif
 
 #include "compat.h"
+#include "fs.h"
 #include "logging.h"
 #include "tinyformat.h"
 #include "utiltime.h"
@@ -26,7 +27,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/filesystem/path.hpp>
 #include <boost/signals2/signal.hpp>
 #include <boost/thread/exceptions.hpp>
 

src/wallet/db.cpp

@@ -6,6 +6,7 @@
 #include "db.h"
 
 #include "addrman.h"
+#include "fs.h"
 #include "hash.h"
 #include "protocol.h"
 #include "util.h"
@@ -17,7 +18,6 @@
 #include <sys/stat.h>
 #endif
 
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 #include <boost/version.hpp>
 

src/wallet/db.h

@@ -7,6 +7,7 @@
 #define BITCOIN_WALLET_DB_H
 
 #include "clientversion.h"
+#include "fs.h"
 #include "serialize.h"
 #include "streams.h"
 #include "sync.h"
@@ -16,7 +17,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/filesystem/path.hpp>
 #include <boost/scope_exit.hpp>
 
 #include <db_cxx.h>

src/wallet/gtest/test_paymentdisclosure.cpp

@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include "fs.h"
 #include "main.h"
 #include "random.h"
 #include "utilmoneystr.h"
@@ -14,7 +15,6 @@
 #include <string>
 #include <set>
 #include <vector>
-#include <boost/filesystem.hpp>
 #include <iostream>
 #include "util.h"
 

src/wallet/gtest/test_wallet.cpp

@@ -3,6 +3,7 @@
 
 #include "base58.h"
 #include "chainparams.h"
+#include "fs.h"
 #include "key_io.h"
 #include "main.h"
 #include "primitives/block.h"
@@ -13,8 +14,6 @@
 #include "zcash/Note.hpp"
 #include "zcash/NoteEncryption.hpp"
 
-#include <boost/filesystem.hpp>
-
 using ::testing::Return;
 
 ACTION(ThrowLogicError) {

src/wallet/gtest/test_wallet_zkeys.cpp

@@ -1,12 +1,11 @@
 #include <gtest/gtest.h>
 
+#include "fs.h"
 #include "zcash/Address.hpp"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
 #include "util.h"
 
-#include <boost/filesystem.hpp>
-
 /**
  * This test covers Sapling methods on CWallet
  * GenerateNewSaplingZKey()

src/wallet/paymentdisclosuredb.cpp

@@ -4,11 +4,10 @@
 
 #include "wallet/paymentdisclosuredb.h"
 
+#include "fs.h"
 #include "util.h"
 #include "dbwrapper.h"
 
-#include <boost/filesystem.hpp>
-
 using namespace std;
 
 static boost::filesystem::path emptyPath;

src/wallet/test/rpc_wallet_tests.cpp

@@ -5,6 +5,7 @@
 #include "rpc/server.h"
 #include "rpc/client.h"
 
+#include "fs.h"
 #include "key_io.h"
 #include "main.h"
 #include "wallet/wallet.h"
@@ -35,7 +36,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/format.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 
 #include <univalue.h>

src/wallet/wallet.cpp

@@ -12,6 +12,7 @@
 #include "consensus/upgrades.h"
 #include "consensus/validation.h"
 #include "consensus/consensus.h"
+#include "fs.h"
 #include "init.h"
 #include "key_io.h"
 #include "main.h"
@@ -32,7 +33,6 @@
 #include <assert.h>
 
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 
 using namespace std;

src/wallet/walletdb.cpp

@@ -6,6 +6,7 @@
 #include "wallet/walletdb.h"
 
 #include "consensus/validation.h"
+#include "fs.h"
 #include "key_io.h"
 #include "main.h"
 #include "proof_verifier.h"
@@ -17,7 +18,6 @@
 #include "wallet/wallet.h"
 #include "zcash/Proof.hpp"
 
-#include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/thread.hpp>

src/zcbenchmarks.cpp

@@ -3,7 +3,6 @@
 #include <map>
 #include <thread>
 #include <unistd.h>
-#include <boost/filesystem.hpp>
 
 #include "coins.h"
 #include "util.h"