diff --git a/src/Makefile.am b/src/Makefile.am index 64249bb74..48e539309 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -201,9 +201,6 @@ BITCOIN_CORE_H = \ validationinterface.h \ versionbits.h \ walletinitinterface.h \ - wallet/asyncrpcoperation_mergetoaddress.h \ - wallet/asyncrpcoperation_sendmany.h \ - wallet/asyncrpcoperation_shieldcoinbase.h \ wallet/coincontrol.h \ wallet/crypter.h \ wallet/db.h \ @@ -293,9 +290,6 @@ libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_wallet_a_SOURCES = \ interfaces/wallet.cpp \ - wallet/asyncrpcoperation_mergetoaddress.cpp \ - wallet/asyncrpcoperation_sendmany.cpp \ - wallet/asyncrpcoperation_shieldcoinbase.cpp \ wallet/crypter.cpp \ wallet/db.cpp \ wallet/feebumper.cpp \ diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp index 486099682..ac8ee9a26 100644 --- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp +++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp @@ -33,7 +33,7 @@ #include using namespace libzcash; -#if 0 + int mta_find_output(UniValue obj, int n) { UniValue outputMapValue = find_value(obj, "outputmap"); @@ -956,4 +956,3 @@ void AsyncRPCOperation_mergetoaddress::unlock_notes() { pwalletMain->UnlockNote(std::get<0>(note)); } } -#endif diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.h b/src/wallet/asyncrpcoperation_mergetoaddress.h index 1565f05c7..cd7cc33dd 100644 --- a/src/wallet/asyncrpcoperation_mergetoaddress.h +++ b/src/wallet/asyncrpcoperation_mergetoaddress.h @@ -21,7 +21,7 @@ // Default transaction fee if caller does not specify one. #define MERGE_TO_ADDRESS_OPERATION_DEFAULT_MINERS_FEE 10000 -#if 0 + using namespace libzcash; // Input UTXO is a tuple of txid, vout, amount @@ -191,4 +191,3 @@ public: #endif /* ASYNCRPCOPERATION_MERGETOADDRESS_H */ -#endif \ No newline at end of file diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp index 28ea6b71d..a89f961ad 100644 --- a/src/wallet/asyncrpcoperation_sendmany.cpp +++ b/src/wallet/asyncrpcoperation_sendmany.cpp @@ -31,7 +31,7 @@ #include using namespace libzcash; -#if 0 + int find_output(UniValue obj, int n) { UniValue outputMapValue = find_value(obj, "outputmap"); if (!outputMapValue.isArray()) { @@ -1170,4 +1170,3 @@ UniValue AsyncRPCOperation_sendmany::getStatus() const { obj.push_back(Pair("params", contextinfo_ )); return obj; } -#endif diff --git a/src/wallet/asyncrpcoperation_sendmany.h b/src/wallet/asyncrpcoperation_sendmany.h index 7b235e51d..6425e0b74 100644 --- a/src/wallet/asyncrpcoperation_sendmany.h +++ b/src/wallet/asyncrpcoperation_sendmany.h @@ -21,7 +21,7 @@ // Default transaction fee if caller does not specify one. #define ASYNC_RPC_OPERATION_DEFAULT_MINERS_FEE 10000 -#if 0 + using namespace libzcash; // A recipient is a tuple of address, amount, memo (optional if zaddr) @@ -190,4 +190,3 @@ public: #endif /* ASYNCRPCOPERATION_SENDMANY_H */ -#endif diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp index 11aae953f..384bd58de 100644 --- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp +++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp @@ -32,7 +32,7 @@ using namespace libzcash; -#if 0 + static int find_output(UniValue obj, int n) { UniValue outputMapValue = find_value(obj, "outputmap"); if (!outputMapValue.isArray()) { @@ -499,4 +499,3 @@ void AsyncRPCOperation_shieldcoinbase::unlock_utxos() { pwalletMain->UnlockCoin(outpt); } } -#endif diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.h b/src/wallet/asyncrpcoperation_shieldcoinbase.h index c5d063705..d65ffe477 100644 --- a/src/wallet/asyncrpcoperation_shieldcoinbase.h +++ b/src/wallet/asyncrpcoperation_shieldcoinbase.h @@ -24,7 +24,7 @@ #define SHIELD_COINBASE_DEFAULT_MINERS_FEE 10000 using namespace libzcash; -#if 0 + struct ShieldCoinbaseUTXO { uint256 txid; int vout; @@ -126,4 +126,3 @@ public: #endif /* ASYNCRPCOPERATION_SHIELDCOINBASE_H */ -#endif