diff options
author | Peter Todd <pete@petertodd.org> | 2015-07-17 06:42:43 -0400 |
---|---|---|
committer | Peter Todd <pete@petertodd.org> | 2015-10-02 12:17:21 +0200 |
commit | 2983fe048479c5365fde273ec6ef74377e222f19 (patch) | |
tree | a168879ce99211e557733a90d270a244df770f1e | |
parent | 8a915e56f4be5d090d79f01cbd4a23ce1b7e9168 (diff) | |
download | bitcoin-2983fe048479c5365fde273ec6ef74377e222f19.tar.xz |
Add uint256 support to CRollingBloomFilter
(cherry picked from commit bbe41088c61f2ad328766e851ffe6169aa80935a)
-rw-r--r-- | src/bloom.cpp | 22 | ||||
-rw-r--r-- | src/bloom.h | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/bloom.cpp b/src/bloom.cpp index 36cba491c4..e15bc32f97 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -234,6 +234,20 @@ void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey) } } +void CRollingBloomFilter::insert(const uint256& hash) +{ + if (nInsertions == 0) { + b1.clear(); + } else if (nInsertions == nBloomSize / 2) { + b2.clear(); + } + b1.insert(hash); + b2.insert(hash); + if (++nInsertions == nBloomSize) { + nInsertions = 0; + } +} + bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const { if (nInsertions < nBloomSize / 2) { @@ -242,6 +256,14 @@ bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const return b1.contains(vKey); } +bool CRollingBloomFilter::contains(const uint256& hash) const +{ + if (nInsertions < nBloomSize / 2) { + return b2.contains(hash); + } + return b1.contains(hash); +} + void CRollingBloomFilter::clear() { b1.clear(); diff --git a/src/bloom.h b/src/bloom.h index bb17f59c86..0daa3728ed 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -114,7 +114,9 @@ public: CRollingBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweak); void insert(const std::vector<unsigned char>& vKey); + void insert(const uint256& hash); bool contains(const std::vector<unsigned char>& vKey) const; + bool contains(const uint256& hash) const; void clear(); |