From a633044b25c307f9ab89715f52fe87cff2de709c Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Tue, 15 Mar 2016 15:59:52 -0600 Subject: [PATCH] Reorder proving key and verifying key arguments. --- src/init.cpp | 6 +++--- src/zerocash/ZerocashParams.cpp | 4 ++-- src/zerocash/ZerocashParams.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index ea58a1ed6..0ddd6a9c6 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -605,7 +605,7 @@ static void ZC_LoadParams() boost::filesystem::path vk_path = ZC_GetParamsDir() / "zc-testnet-public-alpha-verification.key"; libzerocash::ZerocashParams::zerocash_pp::init_public_params(); - + LogPrintf("Loading verification key from %s\n", vk_path.string().c_str()); gettimeofday(&tv_start, 0); @@ -619,8 +619,8 @@ static void ZC_LoadParams() pzerocashParams = new libzerocash::ZerocashParams( INCREMENTAL_MERKLE_TREE_DEPTH, - &vk_loaded, - pk_path.string() + pk_path.string(), + &vk_loaded ); } diff --git a/src/zerocash/ZerocashParams.cpp b/src/zerocash/ZerocashParams.cpp index db406e67f..6d9b98d02 100644 --- a/src/zerocash/ZerocashParams.cpp +++ b/src/zerocash/ZerocashParams.cpp @@ -129,8 +129,8 @@ ZerocashParams::ZerocashParams( ZerocashParams::ZerocashParams( const unsigned int tree_depth, - zerocash_pour_verification_key* p_vk_1, - std::string proving_key_path + std::string proving_key_path, + zerocash_pour_verification_key* p_vk_1 ) : treeDepth(tree_depth), provingKeyPath(proving_key_path) { diff --git a/src/zerocash/ZerocashParams.h b/src/zerocash/ZerocashParams.h index 4c2b3e7c5..07db923ef 100644 --- a/src/zerocash/ZerocashParams.h +++ b/src/zerocash/ZerocashParams.h @@ -37,8 +37,8 @@ public: ZerocashParams( const unsigned int tree_depth, - zerocash_pour_verification_key* p_vk_1, - std::string proving_key_path + std::string proving_key_path, + zerocash_pour_verification_key* p_vk_1 ); const zerocash_pour_proving_key& getProvingKey();