diff options
author | Jeff Garzik <jgarzik@bitpay.com> | 2013-05-30 09:15:16 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-05-30 09:15:16 -0700 |
commit | 6bc6d57303e1c9d469d31a43da83f944a53ab549 (patch) | |
tree | c8cd9fade7925a8065bbaf6c0972f8b8d8e7d804 /src/bitcoinrpc.cpp | |
parent | 87ec1929cf74bf13fa008c70cdf4ac3765efade0 (diff) | |
parent | d98bf10f23e0e633ff2ff33075a353d30bf862b4 (diff) |
Merge pull request #2716 from laanwj/2013_05_30_getwork
Move pMiningKey init out of StartRPCThreads
Diffstat (limited to 'src/bitcoinrpc.cpp')
-rw-r--r-- | src/bitcoinrpc.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 5d64fb767f..a1d76e1812 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -30,10 +30,6 @@ using namespace boost; using namespace boost::asio; using namespace json_spirit; -// Key used by getwork/getblocktemplate miners. -// Allocated in StartRPCThreads, free'd in StopRPCThreads -CReserveKey* pMiningKey = NULL; - static std::string strRPCUserColonPass; // These are created by StartRPCThreads, destroyed in StopRPCThreads @@ -727,9 +723,6 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, void StartRPCThreads() { - // getwork/getblocktemplate mining rewards paid here: - pMiningKey = new CReserveKey(pwalletMain); - strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]; if ((mapArgs["-rpcpassword"] == "") || (mapArgs["-rpcuser"] == mapArgs["-rpcpassword"])) @@ -849,8 +842,6 @@ void StartRPCThreads() void StopRPCThreads() { - delete pMiningKey; pMiningKey = NULL; - if (rpc_io_service == NULL) return; deadlineTimers.clear(); |