Auto merge of #1314 - str4d:fix-getblock-solution-output, r=ebfull

Output Equihash solution in RPC results as a hex string

When the Equihash solution was changed to a compact form in #1175, the block header changed from storing a vector of indices to a vector of chars. `blockToJSON()` was not updated, which meant that RPC calls like `getblock` returned the solution as a list of 1344 integers.

This PR changes `blockToJSON()` to output the Equihash solution as a hex string, identical to how it appears in the block header.
This commit is contained in:
zkbot
2016-08-30 18:40:19 +00:00
3 changed files with 30 additions and 5 deletions

View File

@@ -13,6 +13,7 @@ zcash_gtest_SOURCES = \
gtest/test_keystore.cpp \
gtest/test_noteencryption.cpp \
gtest/test_merkletree.cpp \
gtest/test_rpc.cpp \
gtest/test_circuit.cpp \
gtest/test_txid.cpp \
gtest/test_wallet_zkeys.cpp \