Auto merge of #954 - ebfull:fix-cpourtx-structure, r=ebfull

CPourTx structural changes * Enable binary serialization of proofs and the proving key (closes #799) and make the proofs fixed-size. * Reorder fields of CPourTx to match the spec (closes #927)
2016-05-25 16:33:31 +00:00
parent 1f07deb5db 6b5d608899
commit 8ff7c0752e
15 changed files with 539 additions and 537 deletions
--- a/src/gtest/test_joinsplit.cpp
+++ b/src/gtest/test_joinsplit.cpp
@@ -33,7 +33,7 @@ void test_full_api(ZCJoinSplit* js)
    boost::array<uint256, 2> commitments;
    uint256 rt = tree.root();
    boost::array<ZCNoteEncryption::Ciphertext, 2> ciphertexts;
-    std::string proof;
+    boost::array<unsigned char, ZKSNARK_PROOF_SIZE> proof;

    {
        boost::array<JSInput, 2> inputs = {