From 4941aa82bfe34c643af49112ab834ed566eeb17e Mon Sep 17 00:00:00 2001 From: arkpar Date: Tue, 30 Jun 2015 17:24:32 +0200 Subject: [PATCH] style --- libwhisper/BloomFilter.h | 2 +- libwhisper/Common.cpp | 6 +++--- libwhisper/Common.h | 8 +++++--- libwhisper/WhisperHost.h | 4 ++-- libwhisper/WhisperPeer.cpp | 4 ++-- libwhisper/WhisperPeer.h | 10 +++++----- test/libwhisper/bloomFilter.cpp | 4 ++-- test/libwhisper/whisperTopic.cpp | 4 ++-- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/libwhisper/BloomFilter.h b/libwhisper/BloomFilter.h index 157f4b011..a624be157 100644 --- a/libwhisper/BloomFilter.h +++ b/libwhisper/BloomFilter.h @@ -91,7 +91,7 @@ bool TopicBloomFilterBase::isBitSet(FixedHash const& _h, unsigned _index) return (_h[iByte] & c_powerOfTwoBitMmask[iBit]) != 0; } -using TopicBloomFilter = TopicBloomFilterBase; +using TopicBloomFilter = TopicBloomFilterBase; } } diff --git a/libwhisper/Common.cpp b/libwhisper/Common.cpp index 79c87b96f..748180647 100644 --- a/libwhisper/Common.cpp +++ b/libwhisper/Common.cpp @@ -95,12 +95,12 @@ TopicFilter::TopicFilter(RLP const& _r) } } -FixedHash TopicFilter::exportBloom() const +TopicBloomFilterHash TopicFilter::exportBloom() const { - FixedHash ret; + TopicBloomFilterHash ret; for (TopicMask const& t: m_topicMasks) for (auto const& i: t) - ret |= i.first.template bloomPart(); + ret |= i.first.template bloomPart(); return ret; } diff --git a/libwhisper/Common.h b/libwhisper/Common.h index 7a0707801..d5d926291 100644 --- a/libwhisper/Common.h +++ b/libwhisper/Common.h @@ -58,8 +58,8 @@ enum WhisperPacket PacketCount }; -static const int TopicBloomFilterSize = 64; -static const int WhisperProtocolVersion = 3; +static const int c_topicBloomFilterSize = 64; +static const int c_whisperProtocolVersion = 3; using AbridgedTopic = FixedHash<4>; using Topic = h256; @@ -67,6 +67,8 @@ using Topic = h256; using AbridgedTopics = std::vector; using Topics = h256s; +using TopicBloomFilterHash = FixedHash; + AbridgedTopic abridge(Topic const& _topic); AbridgedTopics abridge(Topics const& _topics); @@ -107,7 +109,7 @@ public: void streamRLP(RLPStream& _s) const { _s << m_topicMasks; } h256 sha3() const; bool matches(Envelope const& _m) const; - FixedHash exportBloom() const; + TopicBloomFilterHash exportBloom() const; private: TopicMasks m_topicMasks; diff --git a/libwhisper/WhisperHost.h b/libwhisper/WhisperHost.h index 1a43eda3a..a6de09c38 100644 --- a/libwhisper/WhisperHost.h +++ b/libwhisper/WhisperHost.h @@ -50,11 +50,11 @@ class WhisperHost: public HostCapability, public Interface, public public: WhisperHost(); virtual ~WhisperHost(); - unsigned protocolVersion() const { return WhisperProtocolVersion; } + unsigned protocolVersion() const { return c_whisperProtocolVersion; } /// remove old messages void cleanup(); std::map all() const { dev::ReadGuard l(x_messages); return m_messages; } - FixedHash bloom() const { dev::Guard l(m_filterLock); return m_bloom; } + TopicBloomFilterHash bloom() const { dev::Guard l(m_filterLock); return m_bloom; } virtual void inject(Envelope const& _e, WhisperPeer* _from = nullptr) override; virtual Topics const& fullTopics(unsigned _id) const override { try { return m_filters.at(m_watches.at(_id).id).full; } catch (...) { return EmptyTopics; } } diff --git a/libwhisper/WhisperPeer.cpp b/libwhisper/WhisperPeer.cpp index 665364f49..4475769e3 100644 --- a/libwhisper/WhisperPeer.cpp +++ b/libwhisper/WhisperPeer.cpp @@ -74,7 +74,7 @@ bool WhisperPeer::interpret(unsigned _id, RLP const& _r) } case TopicFilterPacket: { - setBloom((FixedHash)_r[0]); + setBloom((TopicBloomFilterHash)_r[0]); break; } default: @@ -115,7 +115,7 @@ void WhisperPeer::noteNewMessage(h256 _h, Envelope const& _m) m_unseen.insert(make_pair(rating(_m), _h)); } -void WhisperPeer::sendTopicsOfInterest(FixedHash const& _bloom) +void WhisperPeer::sendTopicsOfInterest(TopicBloomFilterHash const& _bloom) { DEV_GUARDED(x_advertiseTopicsOfInterest) m_advertiseTopicsOfInterest = false; diff --git a/libwhisper/WhisperPeer.h b/libwhisper/WhisperPeer.h index 1be2df97e..48f984013 100644 --- a/libwhisper/WhisperPeer.h +++ b/libwhisper/WhisperPeer.h @@ -53,10 +53,10 @@ public: virtual ~WhisperPeer(); WhisperHost* host() const; static std::string name() { return "shh"; } - static u256 version() { return WhisperProtocolVersion; } + static u256 version() { return c_whisperProtocolVersion; } static unsigned messageCount() { return PacketCount; } - FixedHash bloom() const { dev::Guard g(x_bloom); return m_bloom; } - void sendTopicsOfInterest(FixedHash const& _bloom); ///< sends our bloom filter to remote peer + TopicBloomFilterHash bloom() const { dev::Guard g(x_bloom); return m_bloom; } + void sendTopicsOfInterest(TopicBloomFilterHash const& _bloom); ///< sends our bloom filter to remote peer void noteAdvertiseTopicsOfInterest() { dev::Guard g(x_advertiseTopicsOfInterest); m_advertiseTopicsOfInterest = true; } private: @@ -64,14 +64,14 @@ private: void sendMessages(); unsigned rating(Envelope const&) const { return 0; } // TODO void noteNewMessage(h256 _h, Envelope const& _m); - void setBloom(FixedHash const& _b) { dev::Guard g(x_bloom); m_bloom = _b; } + void setBloom(TopicBloomFilterHash const& _b) { dev::Guard g(x_bloom); m_bloom = _b; } mutable dev::Mutex x_unseen; std::multimap m_unseen; ///< Rated according to what they want. std::chrono::system_clock::time_point m_timer = std::chrono::system_clock::now(); mutable dev::Mutex x_bloom; - FixedHash m_bloom; ///< Peer's topics of interest + TopicBloomFilterHash m_bloom; ///< Peer's topics of interest mutable dev::Mutex x_advertiseTopicsOfInterest; bool m_advertiseTopicsOfInterest; diff --git a/test/libwhisper/bloomFilter.cpp b/test/libwhisper/bloomFilter.cpp index 3e71ca305..814990d52 100644 --- a/test/libwhisper/bloomFilter.cpp +++ b/test/libwhisper/bloomFilter.cpp @@ -28,7 +28,7 @@ using namespace dev; using namespace dev::shh; using TopicBloomFilterShort = TopicBloomFilterBase<4>; -using TopicBloomFilterTest = TopicBloomFilterBase; +using TopicBloomFilterTest = TopicBloomFilterBase; void testAddNonExisting(TopicBloomFilterShort& _f, AbridgedTopic const& _h) { @@ -244,4 +244,4 @@ BOOST_AUTO_TEST_CASE(bloomFilterRaw) BOOST_REQUIRE(!f.contains(b00110111)); } -BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file +BOOST_AUTO_TEST_SUITE_END() diff --git a/test/libwhisper/whisperTopic.cpp b/test/libwhisper/whisperTopic.cpp index a152f756e..e309239c9 100644 --- a/test/libwhisper/whisperTopic.cpp +++ b/test/libwhisper/whisperTopic.cpp @@ -348,8 +348,8 @@ BOOST_AUTO_TEST_CASE(topicAdvertising) } BOOST_REQUIRE(sessions.size()); - FixedHash bf1 = sessions.back().first->cap()->bloom(); - FixedHash bf2 = whost2->bloom(); + TopicBloomFilterHash bf1 = sessions.back().first->cap()->bloom(); + TopicBloomFilterHash bf2 = whost2->bloom(); BOOST_REQUIRE_EQUAL(bf1, bf2); BOOST_REQUIRE(bf1); BOOST_REQUIRE(!whost1->bloom());