aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2015-07-27 18:38:45 +0200
committerPeter Todd <pete@petertodd.org>2015-10-02 12:17:38 +0200
commit25cf1220e64a418420ae030091882337046fb3cf (patch)
tree39ebc923a4f6acfebbfc9bdd036fc4ea1beeb1bd /src
parent2983fe048479c5365fde273ec6ef74377e222f19 (diff)
downloadbitcoin-25cf1220e64a418420ae030091882337046fb3cf.tar.xz
Reuse vector hashing code for uint256
(cherry picked from commit a3d65fedaa18686f0cc007d0a13dba6545250300)
Diffstat (limited to 'src')
-rw-r--r--src/bloom.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/bloom.cpp b/src/bloom.cpp
index e15bc32f97..3f50b1da91 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -236,16 +236,8 @@ 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;
- }
+ vector<unsigned char> data(hash.begin(), hash.end());
+ insert(data);
}
bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const
@@ -258,10 +250,8 @@ bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const
bool CRollingBloomFilter::contains(const uint256& hash) const
{
- if (nInsertions < nBloomSize / 2) {
- return b2.contains(hash);
- }
- return b1.contains(hash);
+ vector<unsigned char> data(hash.begin(), hash.end());
+ return contains(data);
}
void CRollingBloomFilter::clear()