From e8b9370d7310fc744c067795df00e386cb5f29aa Mon Sep 17 00:00:00 2001 From: Pasta Date: Thu, 26 Sep 2019 15:53:22 -0500 Subject: [PATCH 1/3] Remove LogPrints which have been commented out. We have version control systems for a reason, if we want code to not run it should be removed. I personally see no value in keeping these around. I presume at one point they were spamming debug.log so we commented them out, but we really should have just removed them. I believe all of this is dash specific code but any conflicts this does create are so minor they are not of concern imo. Signed-off-by: Pasta --- src/keepass.cpp | 2 -- src/llmq/quorums_signing.cpp | 1 - src/masternode/masternode-payments.cpp | 1 - src/miner.cpp | 2 -- src/privatesend/privatesend-client.cpp | 3 --- src/privatesend/privatesend-server.cpp | 1 - src/validation.cpp | 1 - 7 files changed, 11 deletions(-) diff --git a/src/keepass.cpp b/src/keepass.cpp index c83edaddafb5..3e61db081488 100644 --- a/src/keepass.cpp +++ b/src/keepass.cpp @@ -341,7 +341,6 @@ void CKeePassIntegrator::doHTTPPost(const std::string& sRequest, int& nStatusRet evhttp_add_header(output_headers, "Connection", "close"); // Logging of actual post data disabled as to not write passphrase in debug.log. Only enable temporarily when needed - //LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- send POST data: %s\n", strPost); LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- send POST data\n"); // boost::asio::streambuf request; @@ -452,7 +451,6 @@ std::vector CKeePassIntegrator::rpcGetLogins( doHTTPPost(request.getJson(), nStatus, strResponse); // Logging of actual response data disabled as to not write passphrase in debug.log. Only enable temporarily when needed - //LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::rpcGetLogins -- send result: status: %d response: %s\n", nStatus, strResponse); LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::rpcGetLogins -- send result: status: %d\n", nStatus); if(nStatus != 200) diff --git a/src/llmq/quorums_signing.cpp b/src/llmq/quorums_signing.cpp index 6430a62db135..42adcd0cdcd7 100644 --- a/src/llmq/quorums_signing.cpp +++ b/src/llmq/quorums_signing.cpp @@ -791,7 +791,6 @@ bool CSigningManager::AsyncSignIfMember(Consensus::LLMQType llmqType, const uint } if (!quorum->IsValidMember(activeMasternodeInfo.proTxHash)) { - //LogPrint(BCLog::LLMQ, "CSigningManager::%s -- we're not a valid member of quorum %s\n", __func__, quorum->quorumHash.ToString()); return false; } diff --git a/src/masternode/masternode-payments.cpp b/src/masternode/masternode-payments.cpp index cdccbd0f2e16..7549e33766c3 100644 --- a/src/masternode/masternode-payments.cpp +++ b/src/masternode/masternode-payments.cpp @@ -56,7 +56,6 @@ bool IsOldBudgetBlockValueValid(const CBlock& block, int nBlockHeight, CAmount b LogPrint(BCLog::GOBJECT, "%s -- WARNING: Skipping old budget block value checks, accepting block\n", __func__); return true; } - // LogPrint(BCLog::GOBJECT, "%s -- Block is not in budget cycle window, checking block value against block reward\n", __func__); if(!isBlockRewardValueMet) { strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, block is not in old budget cycle window", nBlockHeight, block.vtx[0]->GetValueOut(), blockReward); diff --git a/src/miner.cpp b/src/miner.cpp index e8d2e491195a..4911eaf5ae6b 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -224,8 +224,6 @@ std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& sc // Update coinbase transaction with additional info about masternode and governance payments, // get some info back to pass to getblocktemplate FillBlockPayments(coinbaseTx, nHeight, blockReward, pblocktemplate->voutMasternodePayments, pblocktemplate->voutSuperblockPayments); - // LogPrintf("CreateNewBlock -- nBlockHeight %d blockReward %lld txoutMasternode %s coinbaseTx %s", - // nHeight, blockReward, pblocktemplate->txoutsMasternode.ToString(), coinbaseTx.ToString()); pblock->vtx[0] = MakeTransactionRef(std::move(coinbaseTx)); pblocktemplate->vTxFees[0] = -nFees; diff --git a/src/privatesend/privatesend-client.cpp b/src/privatesend/privatesend-client.cpp index 318537c872ec..d4258af5749f 100644 --- a/src/privatesend/privatesend-client.cpp +++ b/src/privatesend/privatesend-client.cpp @@ -52,7 +52,6 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string& // process every dsq only once for (const auto& q : vecPrivateSendQueue) { if (q == dsq) { - // LogPrint(BCLog::PRIVATESEND, "DSQUEUE -- %s seen\n", dsq.ToString()); return; } } @@ -143,7 +142,6 @@ void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string& if (!mixingMasternode) return; if (mixingMasternode->pdmnState->addr != pfrom->addr) { - //LogPrint(BCLog::PRIVATESEND, "DSSTATUSUPDATE -- message doesn't match current Masternode: infoMixingMasternode %s addr %s\n", infoMixingMasternode.addr.ToString(), pfrom->addr.ToString()); return; } @@ -181,7 +179,6 @@ void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string& if (!mixingMasternode) return; if (mixingMasternode->pdmnState->addr != pfrom->addr) { - //LogPrint(BCLog::PRIVATESEND, "DSFINALTX -- message doesn't match current Masternode: infoMixingMasternode %s addr %s\n", infoMixingMasternode.addr.ToString(), pfrom->addr.ToString()); return; } diff --git a/src/privatesend/privatesend-server.cpp b/src/privatesend/privatesend-server.cpp index eee84560186b..e536bb29053e 100644 --- a/src/privatesend/privatesend-server.cpp +++ b/src/privatesend/privatesend-server.cpp @@ -112,7 +112,6 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm // process every dsq only once for (const auto& q : vecPrivateSendQueue) { if (q == dsq) { - // LogPrint(BCLog::PRIVATESEND, "DSQUEUE -- %s seen\n", dsq.ToString()); return; } } diff --git a/src/validation.cpp b/src/validation.cpp index e55c4df742ef..0d04a4eb33fc 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1019,7 +1019,6 @@ CAmount GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params& else if(nSubsidyBase < 5) nSubsidyBase = 5; } - // LogPrintf("height %u diff %4.2f reward %d\n", nPrevHeight, dDiff, nSubsidyBase); CAmount nSubsidy = nSubsidyBase * COIN; // yearly decline of production by ~7.1% per year, projected ~18M coins max by year 2050+. From 55cc6886be808a0e24d43f56abeb63fc995611ab Mon Sep 17 00:00:00 2001 From: Pasta Date: Sat, 28 Sep 2019 12:15:02 -0500 Subject: [PATCH 2/3] remove a couple of extra comments Signed-off-by: Pasta --- src/keepass.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/keepass.cpp b/src/keepass.cpp index 3e61db081488..a35826d184d6 100644 --- a/src/keepass.cpp +++ b/src/keepass.cpp @@ -340,7 +340,6 @@ void CKeePassIntegrator::doHTTPPost(const std::string& sRequest, int& nStatusRet // evhttp_add_header(output_headers, "Content-Length", itostr(strMsg.size()).c_str()); evhttp_add_header(output_headers, "Connection", "close"); - // Logging of actual post data disabled as to not write passphrase in debug.log. Only enable temporarily when needed LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- send POST data\n"); // boost::asio::streambuf request; @@ -450,7 +449,6 @@ std::vector CKeePassIntegrator::rpcGetLogins( doHTTPPost(request.getJson(), nStatus, strResponse); - // Logging of actual response data disabled as to not write passphrase in debug.log. Only enable temporarily when needed LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::rpcGetLogins -- send result: status: %d\n", nStatus); if(nStatus != 200) From 93b20c3d60f7de5758c2ce58d86a66803d1675fa Mon Sep 17 00:00:00 2001 From: Pasta Date: Sat, 28 Sep 2019 12:16:37 -0500 Subject: [PATCH 3/3] remove commented out code Signed-off-by: Pasta --- src/keepass.cpp | 73 ------------------------------------------------- 1 file changed, 73 deletions(-) diff --git a/src/keepass.cpp b/src/keepass.cpp index a35826d184d6..ccc71dc4c842 100644 --- a/src/keepass.cpp +++ b/src/keepass.cpp @@ -117,8 +117,6 @@ void CKeePassIntegrator::init() sUrl = SecureString("http://"); sUrl += SecureString(strKeePassEntryName.c_str()); sUrl += SecureString("/"); - //sSubmitUrl = "http://"; - //sSubmitUrl += SecureString(strKeePassEntryName.c_str()); } } @@ -288,28 +286,6 @@ static void http_request_done(struct evhttp_request *req, void *ctx) // Send RPC message to KeePassHttp void CKeePassIntegrator::doHTTPPost(const std::string& sRequest, int& nStatusRet, std::string& strResponseRet) { -// // Prepare communication -// boost::asio::io_service io_service; - -// // Get a list of endpoints corresponding to the server name. -// tcp::resolver resolver(io_service); -// tcp::resolver::query query(KEEPASS_HTTP_HOST, boost::lexical_cast(nPort)); -// tcp::resolver::iterator endpoint_iterator = resolver.resolve(query); -// tcp::resolver::iterator end; - -// // Try each endpoint until we successfully establish a connection. -// tcp::socket socket(io_service); -// boost::system::error_code error = boost::asio::error::host_not_found; -// while (error && endpoint_iterator != end) -// { -// socket.close(); -// socket.connect(*endpoint_iterator++, error); -// } - -// if(error) -// { -// throw boost::system::system_error(error); -// } // Create event base struct event_base *base = event_base_new(); // TODO RAII if (!base) @@ -321,10 +297,6 @@ void CKeePassIntegrator::doHTTPPost(const std::string& sRequest, int& nStatusRet throw std::runtime_error("create connection failed"); evhttp_connection_set_timeout(evcon, KEEPASS_HTTP_CONNECT_TIMEOUT); - // Form the request. -// std::map mapRequestHeaders; -// std::string strPost = constructHTTPPost(sRequest, mapRequestHeaders); - HTTPReply response; struct evhttp_request *req = evhttp_request_new(http_request_done, (void*)&response); // TODO RAII if (req == nullptr) @@ -332,40 +304,14 @@ void CKeePassIntegrator::doHTTPPost(const std::string& sRequest, int& nStatusRet struct evkeyvalq *output_headers = evhttp_request_get_output_headers(req); assert(output_headers); -// s << "POST / HTTP/1.1\r\n" evhttp_add_header(output_headers, "User-Agent", ("dash-json-rpc/" + FormatFullVersion()).c_str()); evhttp_add_header(output_headers, "Host", KEEPASS_HTTP_HOST); evhttp_add_header(output_headers, "Accept", "application/json"); evhttp_add_header(output_headers, "Content-Type", "application/json"); -// evhttp_add_header(output_headers, "Content-Length", itostr(strMsg.size()).c_str()); evhttp_add_header(output_headers, "Connection", "close"); LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- send POST data\n"); -// boost::asio::streambuf request; -// std::ostream request_stream(&request); -// request_stream << strPost; - -// // Send the request. -// boost::asio::write(socket, request); - -// LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- request written\n"); - -// // Read the response status line. The response streambuf will automatically -// // grow to accommodate the entire line. The growth may be limited by passing -// // a maximum size to the streambuf constructor. -// boost::asio::streambuf response; -// boost::asio::read_until(socket, response, "\r\n"); - -// LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- request status line read\n"); - -// // Receive HTTP reply status -// int nProto = 0; -// std::istream response_stream(&response); -// nStatus = ReadHTTPStatus(response_stream, nProto); - - // Attach request data -// std::string sRequest = JSONRPCRequest(strMethod, params, 1); struct evbuffer * output_buffer = evhttp_request_get_output_buffer(req); assert(output_buffer); evbuffer_add(output_buffer, sRequest.data(), sRequest.size()); @@ -381,25 +327,6 @@ void CKeePassIntegrator::doHTTPPost(const std::string& sRequest, int& nStatusRet evhttp_connection_free(evcon); event_base_free(base); -// LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- reading response body start\n"); -// // Read until EOF, writing data to output as we go. -// while (boost::asio::read(socket, response, boost::asio::transfer_at_least(1), error)) -// { -// if (error != boost::asio::error::eof) -// { -// if (error != 0) -// { // 0 is success -// throw boost::system::system_error(error); -// } -// } -// } -// LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- reading response body end\n"); -// -// // Receive HTTP reply message headers and body -// std::map mapHeaders; -// ReadHTTPMessage(response_stream, mapHeaders, strResponse, nProto, std::numeric_limits::max()); -// LogPrint(BCLog::KEEPASS, "CKeePassIntegrator::doHTTPPost -- Processed body\n"); - nStatusRet = response.nStatus; if (response.nStatus == 0) throw std::runtime_error("couldn't connect to server");