Browse Source

Remove verbosity.

cl-refactor
Gav Wood 10 years ago
parent
commit
b2446f651f
  1. 2
      libethereum/Client.cpp
  2. 2
      libp2p/Common.h
  3. 10
      libwhisper/Message.cpp
  4. 9
      libwhisper/Message.h

2
libethereum/Client.cpp

@ -217,7 +217,7 @@ void Client::noteChanged(h256Set const& _filters)
for (auto& i: m_watches) for (auto& i: m_watches)
if (_filters.count(i.second.id)) if (_filters.count(i.second.id))
{ {
cwatch << "!!!" << i.first << i.second.id; // cwatch << "!!!" << i.first << i.second.id;
i.second.changes++; i.second.changes++;
} }
} }

2
libp2p/Common.h

@ -57,7 +57,7 @@ class Session;
struct NetWarn: public LogChannel { static const char* name() { return "!N!"; } static const int verbosity = 0; }; struct NetWarn: public LogChannel { static const char* name() { return "!N!"; } static const int verbosity = 0; };
struct NetNote: public LogChannel { static const char* name() { return "*N*"; } static const int verbosity = 1; }; struct NetNote: public LogChannel { static const char* name() { return "*N*"; } static const int verbosity = 1; };
struct NetMessageSummary: public LogChannel { static const char* name() { return "-N-"; } static const int verbosity = 2; }; struct NetMessageSummary: public LogChannel { static const char* name() { return "-N-"; } static const int verbosity = 2; };
struct NetConnect: public LogChannel { static const char* name() { return "+N+"; } static const int verbosity = 4; }; struct NetConnect: public LogChannel { static const char* name() { return "+N+"; } static const int verbosity = 10; };
struct NetMessageDetail: public LogChannel { static const char* name() { return "=N="; } static const int verbosity = 5; }; struct NetMessageDetail: public LogChannel { static const char* name() { return "=N="; } static const int verbosity = 5; };
struct NetTriviaSummary: public LogChannel { static const char* name() { return "-N-"; } static const int verbosity = 10; }; struct NetTriviaSummary: public LogChannel { static const char* name() { return "-N-"; } static const int verbosity = 10; };
struct NetTriviaDetail: public LogChannel { static const char* name() { return "=N="; } static const int verbosity = 11; }; struct NetTriviaDetail: public LogChannel { static const char* name() { return "=N="; } static const int verbosity = 11; };

10
libwhisper/Message.cpp

@ -89,6 +89,16 @@ Envelope Message::seal(Secret _from, Topic const& _topic, unsigned _ttl, unsigne
return ret; return ret;
} }
Envelope::Envelope(RLP const& _m)
{
cdebug << _m;
m_expiry = _m[0].toInt<unsigned>();
m_ttl = _m[1].toInt<unsigned>();
m_topic = _m[2].toVector<FixedHash<4>>();
m_data = _m[3].toBytes();
m_nonce = _m[4].toInt<u256>();
}
Message Envelope::open(Secret const& _s) const Message Envelope::open(Secret const& _s) const
{ {
return Message(*this, _s); return Message(*this, _s);

9
libwhisper/Message.h

@ -51,14 +51,7 @@ class Envelope
public: public:
Envelope() {} Envelope() {}
Envelope(RLP const& _m) Envelope(RLP const& _m);
{
m_expiry = _m[0].toInt<unsigned>();
m_ttl = _m[1].toInt<unsigned>();
m_topic = _m[2].toVector<FixedHash<4>>();
m_data = _m[3].toBytes();
m_nonce = _m[4].toInt<u256>();
}
operator bool() const { return !!m_expiry; } operator bool() const { return !!m_expiry; }

Loading…
Cancel
Save