Switch miner to P2PKH, add -mineraddress option

Closes #945 and #1955.
2016-12-23 17:30:27 +13:00
parent 2cc0a252ad
commit 8e8b6d701b
8 changed files with 282 additions and 38 deletions
--- a/src/gtest/test_miner.cpp
+++ b/src/gtest/test_miner.cpp
@@ -0,0 +1,103 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "chainparams.h"
+#include "key.h"
+#include "miner.h"
+#include "util.h"
+#ifdef ENABLE_WALLET
+#include "wallet/wallet.h"
+#endif
+
+#include <boost/optional.hpp>
+
+using ::testing::Return;
+
+#ifdef ENABLE_WALLET
+class MockReserveKey : public CReserveKey {
+public:
+    MockReserveKey() : CReserveKey(nullptr) { }
+
+    MOCK_METHOD1(GetReservedKey, bool(CPubKey &pubkey));
+};
+#endif
+
+TEST(Miner, GetMinerScriptPubKey) {
+    SelectParams(CBaseChainParams::MAIN);
+
+    boost::optional<CScript> scriptPubKey;
+#ifdef ENABLE_WALLET
+    MockReserveKey reservekey;
+    EXPECT_CALL(reservekey, GetReservedKey(::testing::_))
+        .WillRepeatedly(Return(false));
+#endif
+
+    // No miner address set
+#ifdef ENABLE_WALLET
+    scriptPubKey = GetMinerScriptPubKey(reservekey);
+#else
+    scriptPubKey = GetMinerScriptPubKey();
+#endif
+    EXPECT_FALSE((bool) scriptPubKey);
+
+    mapArgs["-mineraddress"] = "notAnAddress";
+#ifdef ENABLE_WALLET
+    scriptPubKey = GetMinerScriptPubKey(reservekey);
+#else
+    scriptPubKey = GetMinerScriptPubKey();
+#endif
+    EXPECT_FALSE((bool) scriptPubKey);
+
+    // Partial address
+    mapArgs["-mineraddress"] = "t1T8yaLVhNqxA5KJcmiqq";
+#ifdef ENABLE_WALLET
+    scriptPubKey = GetMinerScriptPubKey(reservekey);
+#else
+    scriptPubKey = GetMinerScriptPubKey();
+#endif
+    EXPECT_FALSE((bool) scriptPubKey);
+
+    // Typo in address
+    mapArgs["-mineraddress"] = "t1TByaLVhNqxA5KJcmiqqFN88e8DNp2PBfF";
+#ifdef ENABLE_WALLET
+    scriptPubKey = GetMinerScriptPubKey(reservekey);
+#else
+    scriptPubKey = GetMinerScriptPubKey();
+#endif
+    EXPECT_FALSE((bool) scriptPubKey);
+
+    // Set up expected scriptPubKey for t1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF
+    CKeyID keyID;
+    keyID.SetHex("eb88f1c65b39a823479ac9c7db2f4a865960a165");
+    CScript expectedScriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
+
+    // Valid address
+    mapArgs["-mineraddress"] = "t1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF";
+#ifdef ENABLE_WALLET
+    scriptPubKey = GetMinerScriptPubKey(reservekey);
+#else
+    scriptPubKey = GetMinerScriptPubKey();
+#endif
+    EXPECT_TRUE((bool) scriptPubKey);
+    EXPECT_EQ(expectedScriptPubKey, *scriptPubKey);
+
+    // Valid address with leading whitespace
+    mapArgs["-mineraddress"] = "  t1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF";
+#ifdef ENABLE_WALLET
+    scriptPubKey = GetMinerScriptPubKey(reservekey);
+#else
+    scriptPubKey = GetMinerScriptPubKey();
+#endif
+    EXPECT_TRUE((bool) scriptPubKey);
+    EXPECT_EQ(expectedScriptPubKey, *scriptPubKey);
+
+    // Valid address with trailing whitespace
+    mapArgs["-mineraddress"] = "t1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF  ";
+#ifdef ENABLE_WALLET
+    scriptPubKey = GetMinerScriptPubKey(reservekey);
+#else
+    scriptPubKey = GetMinerScriptPubKey();
+#endif
+    EXPECT_TRUE((bool) scriptPubKey);
+    EXPECT_EQ(expectedScriptPubKey, *scriptPubKey);
+}