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

Reorder proving key and verifying key arguments.

Browse Source
This commit is contained in:
Sean Bowe
2016-03-15 15:59:52 -06:00
parent 8f8c4c6c0c
commit a633044b25
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/init.cpp
View File

@@ -605,7 +605,7 @@ static void ZC_LoadParams()
boost::filesystem::path vk_path = ZC_GetParamsDir() / "zc-testnet-public-alpha-verification.key"; boost::filesystem::path vk_path = ZC_GetParamsDir() / "zc-testnet-public-alpha-verification.key";
libzerocash::ZerocashParams::zerocash_pp::init_public_params(); libzerocash::ZerocashParams::zerocash_pp::init_public_params();
LogPrintf("Loading verification key from %s\n", vk_path.string().c_str()); LogPrintf("Loading verification key from %s\n", vk_path.string().c_str());
gettimeofday(&tv_start, 0); gettimeofday(&tv_start, 0);
@@ -619,8 +619,8 @@ static void ZC_LoadParams()
pzerocashParams = new libzerocash::ZerocashParams( pzerocashParams = new libzerocash::ZerocashParams(
INCREMENTAL_MERKLE_TREE_DEPTH, INCREMENTAL_MERKLE_TREE_DEPTH,
&vk_loaded, pk_path.string(),
pk_path.string() &vk_loaded
); );
} }

4
src/zerocash/ZerocashParams.cpp
View File

@@ -129,8 +129,8 @@ ZerocashParams::ZerocashParams(
ZerocashParams::ZerocashParams( ZerocashParams::ZerocashParams(
const unsigned int tree_depth, const unsigned int tree_depth,
zerocash_pour_verification_key<ZerocashParams::zerocash_pp>* p_vk_1, std::string proving_key_path,
std::string proving_key_path zerocash_pour_verification_key<ZerocashParams::zerocash_pp>* p_vk_1
) : ) :
treeDepth(tree_depth), provingKeyPath(proving_key_path) treeDepth(tree_depth), provingKeyPath(proving_key_path)
{ {

4
src/zerocash/ZerocashParams.h
View File

@@ -37,8 +37,8 @@ public:
ZerocashParams( ZerocashParams(
const unsigned int tree_depth, const unsigned int tree_depth,
zerocash_pour_verification_key<ZerocashParams::zerocash_pp>* p_vk_1, std::string proving_key_path,
std::string proving_key_path zerocash_pour_verification_key<ZerocashParams::zerocash_pp>* p_vk_1
); );
const zerocash_pour_proving_key<zerocash_pp>& getProvingKey(); const zerocash_pour_proving_key<zerocash_pp>& getProvingKey();