diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index d130194cc..e3346754b 100644 --- a/libethereum/Client.cpp +++ b/libethereum/Client.cpp @@ -217,7 +217,7 @@ void Client::noteChanged(h256Set const& _filters) for (auto& i: m_watches) if (_filters.count(i.second.id)) { - cwatch << "!!!" << i.first << i.second.id; +// cwatch << "!!!" << i.first << i.second.id; i.second.changes++; } } diff --git a/libp2p/Common.h b/libp2p/Common.h index 34f47b236..d46c5eed1 100644 --- a/libp2p/Common.h +++ b/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 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 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 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; }; diff --git a/libwhisper/Message.cpp b/libwhisper/Message.cpp index 65da72f9d..8e3e80a12 100644 --- a/libwhisper/Message.cpp +++ b/libwhisper/Message.cpp @@ -89,6 +89,16 @@ Envelope Message::seal(Secret _from, Topic const& _topic, unsigned _ttl, unsigne return ret; } +Envelope::Envelope(RLP const& _m) +{ + cdebug << _m; + m_expiry = _m[0].toInt(); + m_ttl = _m[1].toInt(); + m_topic = _m[2].toVector>(); + m_data = _m[3].toBytes(); + m_nonce = _m[4].toInt(); +} + Message Envelope::open(Secret const& _s) const { return Message(*this, _s); diff --git a/libwhisper/Message.h b/libwhisper/Message.h index 954aed4a0..f582b14c7 100644 --- a/libwhisper/Message.h +++ b/libwhisper/Message.h @@ -51,14 +51,7 @@ class Envelope public: Envelope() {} - Envelope(RLP const& _m) - { - m_expiry = _m[0].toInt(); - m_ttl = _m[1].toInt(); - m_topic = _m[2].toVector>(); - m_data = _m[3].toBytes(); - m_nonce = _m[4].toInt(); - } + Envelope(RLP const& _m); operator bool() const { return !!m_expiry; }