Fix some Travis CI Build errors (#28)

* Properly encapsulate wallet code with ENABLE_WALLET ifdefs * Update function params in zmqpublishnotifier
Sjors · Aug 14, 2017 · aa4e514 · aa4e514
1 parent fa0c95e
commit aa4e514
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -27,7 +27,10 @@
 #include "utilmoneystr.h"
 #include "validation.h"
 #include "validationinterface.h"
+
+#ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
+#endif
 
 #include <algorithm>
 #include <boost/thread.hpp>
@@ -711,6 +714,7 @@ CTransaction CreateWTJoinTx(uint32_t nHeight)
     if (!wjtx.vout.size())
         return CTransaction();
 
+#ifdef ENABLE_WALLET
     // TODO improve fee calculation
     CAmount nBaseFee = CENT;
     // Calculate total group fee to be split evenly between sidechain & mainchain
@@ -727,6 +731,7 @@ CTransaction CreateWTJoinTx(uint32_t nHeight)
     // leaving the rest for the mainchain miners
     if (nJoinFee > 0)
         wjtx.vout.push_back(CTxOut((nJoinFee / 2), SIDECHAIN_FEESCRIPT));
+#endif
 
     wjtx.vin.resize(1);
     wjtx.vin[0].scriptSig = CScript() << OP_0;

diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
@@ -166,12 +166,11 @@ bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
 {
     LogPrint("zmq", "zmq: Publish rawblock %s\n", pindex->GetBlockHash().GetHex());
 
-    const Consensus::Params& consensusParams = Params().GetConsensus();
     CDataStream ss(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
     {
         LOCK(cs_main);
         CBlock block;
-        if(!ReadBlockFromDisk(block, pindex, consensusParams))
+        if(!ReadBlockFromDisk(block, pindex))
         {
             zmqError("Can't read block from disk");
             return false;