From 601181c6914e6272f5d98e79ac0be6fa6b466914 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 25 Oct 2012 19:13:36 -0700 Subject: [PATCH] Cleanups. --- src/Peer.cpp | 61 ++++++++++++++++++++++++++-------------- src/RippleAddress.cpp | 41 ++++++++++++++++----------- src/SHAMap.cpp | 4 +-- src/SerializedObject.cpp | 21 ++++---------- 4 files changed, 72 insertions(+), 55 deletions(-) diff --git a/src/Peer.cpp b/src/Peer.cpp index 3b6470afe..a92e79446 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -384,7 +384,8 @@ void Peer::processReadBuffer() ripple::TMHello msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvHello(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -393,7 +394,8 @@ void Peer::processReadBuffer() ripple::TMErrorMsg msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvErrorMessage(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -402,7 +404,8 @@ void Peer::processReadBuffer() ripple::TMPing msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvPing(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -411,7 +414,8 @@ void Peer::processReadBuffer() ripple::TMGetContacts msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvGetContacts(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -420,7 +424,8 @@ void Peer::processReadBuffer() ripple::TMContact msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvContact(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; case ripple::mtGET_PEERS: @@ -428,7 +433,8 @@ void Peer::processReadBuffer() ripple::TMGetPeers msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvGetPeers(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; case ripple::mtPEERS: @@ -436,7 +442,8 @@ void Peer::processReadBuffer() ripple::TMPeers msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvPeers(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -445,7 +452,8 @@ void Peer::processReadBuffer() ripple::TMSearchTransaction msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvSearchTransaction(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -454,7 +462,8 @@ void Peer::processReadBuffer() ripple::TMGetAccount msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvGetAccount(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -463,7 +472,8 @@ void Peer::processReadBuffer() ripple::TMAccount msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvAccount(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -472,7 +482,8 @@ void Peer::processReadBuffer() ripple::TMTransaction msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvTransaction(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -481,7 +492,8 @@ void Peer::processReadBuffer() ripple::TMStatusChange msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvStatus(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -490,7 +502,8 @@ void Peer::processReadBuffer() ripple::TMProposeSet msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvPropose(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -499,7 +512,8 @@ void Peer::processReadBuffer() ripple::TMGetLedger msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvGetLedger(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -508,7 +522,8 @@ void Peer::processReadBuffer() ripple::TMLedgerData msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvLedger(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -517,7 +532,8 @@ void Peer::processReadBuffer() ripple::TMHaveTransactionSet msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvHaveTxSet(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -526,7 +542,8 @@ void Peer::processReadBuffer() ripple::TMValidation msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvValidation(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; #if 0 @@ -535,7 +552,8 @@ void Peer::processReadBuffer() ripple::TM msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recv(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; @@ -545,13 +563,14 @@ void Peer::processReadBuffer() ripple::TMGetObjectByHash msg; if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvGetObjectByHash(msg); - else std::cerr << "parse error: " << type << std::endl; + else + cLog(lsWARNING) << "parse error: " << type; } break; default: - std::cerr << "Unknown Msg: " << type << std::endl; - std::cerr << strHex(&mReadbuf[0], mReadbuf.size()); + cLog(lsWARNING) << "Unknown Msg: " << type; + cLog(lsWARNING) << strHex(&mReadbuf[0], mReadbuf.size()); } } } diff --git a/src/RippleAddress.cpp b/src/RippleAddress.cpp index 03abd4052..46d769d30 100644 --- a/src/RippleAddress.cpp +++ b/src/RippleAddress.cpp @@ -1,17 +1,24 @@ #include "RippleAddress.h" + +#include +#include +#include + +#include +#include +#include + +#include + #include "key.h" #include "Config.h" #include "BitcoinUtil.h" #include "rfc1751.h" #include "utils.h" +#include "Log.h" + +SETUP_LOG(); -#include -#include -#include -#include -#include -#include -#include RippleAddress::RippleAddress() { @@ -402,7 +409,7 @@ bool RippleAddress::accountPublicVerify(const uint256& uHash, const std::vector< if (!ckPublic.SetPubKey(getAccountPublic())) { // Bad private key. - std::cerr << "accountPublicVerify: Bad private key." << std::endl; + cLog(lsWARNING) << "accountPublicVerify: Bad private key."; bVerified = false; } else @@ -497,14 +504,13 @@ bool RippleAddress::accountPrivateSign(const uint256& uHash, std::vector RippleAddress::accountPrivateEncrypt(const RippleAddr if (!ckPublic.SetPubKey(naPublicTo.getAccountPublic())) { // Bad public key. - std::cerr << "accountPrivateEncrypt: Bad public key." << std::endl; + cLog(lsWARNING) << "accountPrivateEncrypt: Bad public key."; } else if (!ckPrivate.SetPrivateKeyU(getAccountPrivate())) { // Bad private key. - std::cerr << "accountPrivateEncrypt: Bad private key." << std::endl; + cLog(lsWARNING) << "accountPrivateEncrypt: Bad private key."; } else { - try { + try + { vucCipherText = ckPrivate.encryptECIES(ckPublic, vucPlainText); } catch (...) @@ -570,12 +577,12 @@ std::vector RippleAddress::accountPrivateDecrypt(const RippleAddr if (!ckPublic.SetPubKey(naPublicFrom.getAccountPublic())) { // Bad public key. - std::cerr << "accountPrivateDecrypt: Bad public key." << std::endl; + cLog(lsWARNING) << "accountPrivateDecrypt: Bad public key."; } else if (!ckPrivate.SetPrivateKeyU(getAccountPrivate())) { // Bad private key. - std::cerr << "accountPrivateDecrypt: Bad private key." << std::endl; + cLog(lsWARNING) << "accountPrivateDecrypt: Bad private key."; } else { diff --git a/src/SHAMap.cpp b/src/SHAMap.cpp index 85bbf3a61..b7a775778 100644 --- a/src/SHAMap.cpp +++ b/src/SHAMap.cpp @@ -123,12 +123,12 @@ void SHAMap::dirtyUp(std::stack& stack, const uint256& if (!node->setChildHash(branch, prevHash)) { - std::cerr << "dirtyUp terminates early" << std::endl; + cLog(lsFATAL) << "dirtyUp terminates early"; assert(false); return; } #ifdef ST_DEBUG - std::cerr << "dirtyUp sets branch " << branch << " to " << prevHash << std::endl; + cLog(lsTRACE) << "dirtyUp sets branch " << branch << " to " << prevHash; #endif prevHash = node->getNodeHash(); assert(prevHash.isNonZero()); diff --git a/src/SerializedObject.cpp b/src/SerializedObject.cpp index 1dfe373dd..afd876410 100644 --- a/src/SerializedObject.cpp +++ b/src/SerializedObject.cpp @@ -565,7 +565,8 @@ uint160 STObject::getFieldH160(SField::ref field) const uint256 STObject::getFieldH256(SField::ref field) const { const SerializedType* rf = peekAtPField(field); - if (!rf) throw std::runtime_error("Field not found"); + if (!rf) + throw std::runtime_error("Field not found"); SerializedTypeID id = rf->getSType(); if (id == STI_NOTPRESENT) return uint256(); // optional field not present const STHash256 *cf = dynamic_cast(rf); @@ -577,17 +578,12 @@ RippleAddress STObject::getFieldAccount(SField::ref field) const { const SerializedType* rf = peekAtPField(field); if (!rf) - { -#ifdef DEBUG - std::cerr << "Account field not found" << std::endl; - std::cerr << getFullText() << std::endl; -#endif throw std::runtime_error("Field not found"); - } SerializedTypeID id = rf->getSType(); if (id == STI_NOTPRESENT) return RippleAddress(); // optional field not present const STAccount* cf = dynamic_cast(rf); - if (!cf) throw std::runtime_error("Wrong field type"); + if (!cf) + throw std::runtime_error("Wrong field type"); return cf->getValueNCA(); } @@ -596,18 +592,13 @@ uint160 STObject::getFieldAccount160(SField::ref field) const uint160 a; const SerializedType* rf = peekAtPField(field); if (!rf) - { -#ifdef DEBUG - std::cerr << "Account field not found" << std::endl; - std::cerr << getFullText() << std::endl; -#endif throw std::runtime_error("Field not found"); - } SerializedTypeID id = rf->getSType(); if (id != STI_NOTPRESENT) { const STAccount* cf = dynamic_cast(rf); - if (!cf) throw std::runtime_error("Wrong field type"); + if (!cf) + throw std::runtime_error("Wrong field type"); cf->getValueH160(a); } return a;