From d7972e726dccccdcecc826944dba49de731ef9b1 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sun, 16 Nov 2014 21:26:39 +0100 Subject: [PATCH] Minor UI changes and reduction of verbosity. --- alethzero/MainWin.cpp | 2 +- libethereum/State.cpp | 4 ++-- libp2p/Host.cpp | 2 +- libweb3jsonrpc/WebThreeStubServer.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index dc5b326bc..280a70fe1 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -956,7 +956,7 @@ void Main::refreshBlockCount() cwatch << "refreshBlockCount()"; auto d = ethereum()->blockChain().details(); auto diff = BlockInfo(ethereum()->blockChain().block()).difficulty; - ui->blockCount->setText(QString("%6 #%1 @%3 T%2 N%4 D%5").arg(d.number).arg(toLog2(d.totalDifficulty)).arg(toLog2(diff)).arg(dev::eth::c_protocolVersion).arg(dev::eth::c_databaseVersion).arg(m_privateChain.size() ? "[" + m_privateChain + "] " : "testnet")); + ui->blockCount->setText(QString("%6 #%1 @%3 T%2 PV%4 D%5").arg(d.number).arg(toLog2(d.totalDifficulty)).arg(toLog2(diff)).arg(dev::eth::c_protocolVersion).arg(dev::eth::c_databaseVersion).arg(m_privateChain.size() ? "[" + m_privateChain + "] " : "testnet")); } static bool blockMatch(string const& _f, dev::eth::BlockDetails const& _b, h256 _h, BlockChain const& _bc) diff --git a/libethereum/State.cpp b/libethereum/State.cpp index ee93fdc55..69faf983c 100644 --- a/libethereum/State.cpp +++ b/libethereum/State.cpp @@ -322,8 +322,8 @@ StateDiff State::diff(State const& _c) const for (auto i: _c.m_cache) ads.insert(i.first); - cnote << *this; - cnote << _c; +// cnote << *this; +// cnote << _c; for (auto i: ads) { diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp index be9f2f7ae..996e219db 100644 --- a/libp2p/Host.cpp +++ b/libp2p/Host.cpp @@ -385,7 +385,7 @@ void Host::populateAddresses() shared_ptr Host::noteNode(NodeId _id, bi::tcp::endpoint _a, Origin _o, bool _ready, NodeId _oldId) { RecursiveGuard l(x_peers); - if (_a.port() < 30300 || _a.port() > 30303) + if (_a.port() < 30300 || _a.port() > 30305) cwarn << "Weird port being recorded: " << _a.port(); if (_a.port() >= /*49152*/32768) diff --git a/libweb3jsonrpc/WebThreeStubServer.cpp b/libweb3jsonrpc/WebThreeStubServer.cpp index 03c2a37ac..5b362cde5 100644 --- a/libweb3jsonrpc/WebThreeStubServer.cpp +++ b/libweb3jsonrpc/WebThreeStubServer.cpp @@ -507,7 +507,7 @@ std::string WebThreeStubServer::shh_newGroup(std::string const& _id, std::string std::string WebThreeStubServer::shh_newIdentity() { - cnote << this << m_ids; +// cnote << this << m_ids; KeyPair kp = KeyPair::create(); m_ids[kp.pub()] = kp.secret(); return toJS(kp.pub()); @@ -535,7 +535,7 @@ int WebThreeStubServer::eth_peerCount() bool WebThreeStubServer::shh_post(Json::Value const& _json) { - cnote << this << m_ids; +// cnote << this << m_ids; shh::Message m = toMessage(_json); Secret from;