Testnet modifications -- just take the parameters from regtest. Also, move loading ZC params to _before_ verification.

This commit is contained in:
Sean Bowe
2016-01-13 11:28:24 -07:00
parent d66877afb3
commit 9144ea8c2b
2 changed files with 11 additions and 9 deletions

View File

@@ -638,6 +638,9 @@ static void ZC_LoadParams()
*/
bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
{
// ********************************************************* Step 0: Load zcash params
ZC_LoadParams();
// ********************************************************* Step 1: setup
#ifdef _MSC_VER
// Turn off Microsoft heap dump noise
@@ -1265,9 +1268,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
mempool.ReadFeeEstimates(est_filein);
fFeeEstimatesInitialized = true;
// ********************************************************* Step 7i: Load zcash params
ZC_LoadParams();
// These must be disabled for now, they are buggy and we probably don't
// want any of libsnark's profiling in production anyway.
libsnark::inhibit_profiling_info = true;