Auto merge of #1965 - str4d:1955-single-address-mining, r=bitcartel

Switch miner to P2PKH, add -mineraddress option Closes #945 and #1955.
2017-02-09 20:58:00 +00:00
parent 253c610783 9bba9b37c8
commit 0c78782662
8 changed files with 344 additions and 57 deletions
--- a/src/Makefile.gtest.include
+++ b/src/Makefile.gtest.include
@@ -26,6 +26,7 @@ zcash_gtest_SOURCES += \
 	gtest/test_noteencryption.cpp \
 	gtest/test_merkletree.cpp \
 	gtest/test_metrics.cpp \
+	gtest/test_miner.cpp \
 	gtest/test_pow.cpp \
 	gtest/test_random.cpp \
 	gtest/test_rpc.cpp \