From ad9a8c35d60caad3e097e9bc78aaad405228a13d Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 25 Sep 2017 12:02:02 +0200 Subject: [PATCH] Test --- src/util.cpp | 2 +- src/zcash/CreateJoinSplit.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util.cpp b/src/util.cpp index 9d684a96e..958c6c012 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -644,7 +644,7 @@ void ReadConfigFile(map& mapSettingsRet, // If datadir is changed in .conf file: ClearDatadirCache(); extern uint16_t BITCOIND_PORT; - BITCOIND_PORT = GetArg("-rpcport",BITCOIND_PORT); + BITCOIND_PORT = GetArg("-rpcport",BaseParams().RPCPort()); fprintf(stderr,"from conf file %s RPC %u, used to be %u\n",ASSETCHAINS_SYMBOL,BITCOIND_PORT,BITCOIND_PORT); } diff --git a/src/zcash/CreateJoinSplit.cpp b/src/zcash/CreateJoinSplit.cpp index 7fdc8d953..f29b2ec82 100644 --- a/src/zcash/CreateJoinSplit.cpp +++ b/src/zcash/CreateJoinSplit.cpp @@ -8,6 +8,7 @@ #include "libsnark/common/profiling.hpp" char ASSETCHAINS_SYMBOL[16]; int64_t MAX_MONEY = 200000000 * 100000000LL; +uint16_t BITCOIND_PORT = 7771; using namespace libzcash;