DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Update UniValue includes in Zcash-specific code

Browse Source
This commit is contained in:
Jack Grigg
2017-02-10 00:28:29 +00:00
parent 1dc626314d
commit 2cc6bab201
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.gtest.include
View File

@@ -40,9 +40,9 @@ zcash_gtest_SOURCES += \
wallet/gtest/test_wallet.cpp wallet/gtest/test_wallet.cpp
endif endif
zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES)
zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)
if ENABLE_ZMQ if ENABLE_ZMQ
zcash_gtest_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) zcash_gtest_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)

2
src/asyncrpcoperation.h
View File

@@ -15,7 +15,7 @@
#include <utility> #include <utility>
#include <future> #include <future>
#include "univalue/univalue.h" #include <univalue.h>
using namespace std; using namespace std;

2
src/gtest/json_test_vectors.h
View File

@@ -5,7 +5,7 @@
#include "serialize.h" #include "serialize.h"
#include "streams.h" #include "streams.h"
#include "univalue/univalue.h" #include <univalue.h>
UniValue UniValue
read_json(const std::string& jsondata); read_json(const std::string& jsondata);

2
src/gtest/test_rpc.cpp
View File

@@ -1,5 +1,5 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "univalue/univalue.h" #include <univalue.h>
#include "chain.h" #include "chain.h"
#include "chainparams.h" #include "chainparams.h"

2
src/rpcprotocol.cpp
View File

@@ -26,7 +26,7 @@
#include <boost/iostreams/stream.hpp> #include <boost/iostreams/stream.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "univalue/univalue.h" #include <univalue.h>
using namespace std; using namespace std;

2
src/wallet/asyncrpcoperation_sendmany.h
View File

@@ -16,7 +16,7 @@
#include <unordered_map> #include <unordered_map>
#include <tuple> #include <tuple>
#include "univalue/univalue.h" #include <univalue.h>
// Default transaction fee if caller does not specify one. // Default transaction fee if caller does not specify one.
#define ASYNC_RPC_OPERATION_DEFAULT_MINERS_FEE 10000 #define ASYNC_RPC_OPERATION_DEFAULT_MINERS_FEE 10000