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

Update to beta2 public parameters, remove regtest/testnet3 parameters

Browse Source 
subdirectories.
This commit is contained in:
Sean Bowe
2016-10-03 15:58:02 -06:00
parent fa632c1c91
commit 796c7ee52f
4 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/init.cpp
View File

@@ -613,8 +613,8 @@ static void ZC_LoadParams()
struct timeval tv_start, tv_end;
float elapsed;
boost::filesystem::path pk_path = ZC_GetParamsDir() / "z9-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "z9-verifying.key";
boost::filesystem::path pk_path = ZC_GetParamsDir() / "beta2-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "beta2-verifying.key";
pzcashParams = ZCJoinSplit::Unopened();

1
src/util.cpp
View File

@@ -478,7 +478,6 @@ const boost::filesystem::path &ZC_GetParamsDir()
return path;
path = ZC_GetBaseParamsDir();
path /= BaseParams().DataDir();
return path;
}

4
src/zcbenchmarks.cpp
View File

@@ -52,8 +52,8 @@ double benchmark_sleep()
double benchmark_parameter_loading()
{
// FIXME: this is duplicated with the actual loading code
boost::filesystem::path pk_path = ZC_GetParamsDir() / "z9-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "z9-verifying.key";
boost::filesystem::path pk_path = ZC_GetParamsDir() / "beta2-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "beta2-verifying.key";
struct timeval tv_start;
timer_start(tv_start);