Reorder proving key and verifying key arguments.

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
     );
 }
 

src/zerocash/ZerocashParams.cpp

@@ -129,8 +129,8 @@ ZerocashParams::ZerocashParams(
 
 ZerocashParams::ZerocashParams(
     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)
 {

src/zerocash/ZerocashParams.h

@@ -37,8 +37,8 @@ public:
 
     ZerocashParams(
         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();