Skip to content

trivial: Removes unsed CBloomFilter constructor. #13948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 14, 2018
Merged

trivial: Removes unsed CBloomFilter constructor. #13948

merged 1 commit into from
Aug 14, 2018

Conversation

l2a5b1
Copy link
Contributor

@l2a5b1 l2a5b1 commented Aug 12, 2018

This pull request removes the CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int) constructor, which became obsolete with 086ee67.

@l2a5b1
Removes unsed CBloomFilter constructor.
265bd50 
This commit removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.
@Empact
Copy link
Contributor

Empact commented Aug 13, 2018

utACK 265bd50

nit: After this there are no references to BLOOM_UPDATE_NONE outside the tests. May be good to apply that here?:

bitcoin/src/bloom.h

Line 71 in 0df7a6c

CBloomFilter() : isFull(true), isEmpty(false), nHashFuncs(0), nTweak(0), nFlags(0) {}

@practicalswift
Copy link
Contributor

utACK 265bd50

Nice! How did you find this one?

@domob1812
Copy link
Contributor

utACK 265bd50

@fanquake
Copy link
Member

utACK 265bd50

@laanwj
Copy link
Member

laanwj commented Aug 14, 2018

utACK 265bd50

@laanwj laanwj merged commit 265bd50 into bitcoin:master Aug 14, 2018
@l2a5b1
Copy link
Contributor Author

l2a5b1 commented Aug 14, 2018

Thanks all!

@Empact, that's a nice find. I like your suggestion and I would prefer BLOOM_UPDATE_NONE over value 0 as argument.

@practicalswift, I bumped into this while going through friend class declarations.

@l2a5b1 l2a5b1 deleted the patch/remove-private-cbloomfilter-contructor branch August 14, 2018 15:00
@Bushstar Bushstar mentioned this pull request Sep 4, 2018
Merged
@random-zebra random-zebra mentioned this pull request Feb 5, 2021
Merged
furszy added a commit to PIVX-Project/PIVX that referenced this pull request Feb 14, 2021
@furszy
Merge #2188: [Core] More efficient rolling Bloom filter
c5edef0 
1378196 Removes unsed `CBloomFilter` constructor. (251)
c4c4c9c Switch to a more efficient rolling Bloom filter (Pieter Wuille)

Pull request description:

  From bitcoin#7113

  > For each 'bit' in the filter we really maintain 2 bits, which store either:
  >
  >0: not set
  >1-3: set in generation N
  >After (nElements / 2) insertions, we switch to a new generation, and wipe entries which already had the new generation number, effectively switching from the last 1.5 * nElements set to the last 1.0 * nElements set.
  >
  >This is 25% more space efficient than the previous implementation, and can (at peak) store 1.5 times the requested amount of history (though only 1.0 times the requested history is guaranteed).
  >
  >The existing unit tests should be sufficient.

  Also included bitcoin#13948

ACKs for top commit:
  furszy:
    good, ACK 1378196
  Fuzzbawls:
    utACK 1378196

Tree-SHA512: c73e34086b2a8a1fd1df5acff9a72c034ac94608871e90a06e9f0edddb4f652b274a1f961b1d26ca46737c1e25f90a43e57099aa5b869876d10fe258cd0f0741
@str4d str4d mentioned this pull request Mar 5, 2021
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Mar 5, 2021
@zkbot
Auto merge of #5026 - str4d:bloom-filter-backports, r=<try>
be45961 
Backport bloom filter improvements

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7113
- bitcoin/bitcoin#7818
  - Only the second commit (to resolve conflicts).
- bitcoin/bitcoin#7934
- bitcoin/bitcoin#8655
  - Partial backport to help resolve conflicts.
- bitcoin/bitcoin#9060
- bitcoin/bitcoin#9223
- bitcoin/bitcoin#9644
  - Partial backport to help resolve conflicts.
- bitcoin/bitcoin#9916
- bitcoin/bitcoin#9750
- bitcoin/bitcoin#13176
- bitcoin/bitcoin#13948
- bitcoin/bitcoin#16073
- bitcoin/bitcoin#18670
- bitcoin/bitcoin#18806
  - Reveals upstream's covert fix for CVE-2013-5700.
- bitcoin/bitcoin#19968
zkbot added a commit to zcash/zcash that referenced this pull request Apr 15, 2021
@zkbot
Auto merge of #5026 - str4d:bloom-filter-backports, r=str4d
78de0cd 
Backport bloom filter improvements

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7113
- bitcoin/bitcoin#7818
  - Only the second commit (to resolve conflicts).
- bitcoin/bitcoin#7934
- bitcoin/bitcoin#8655
  - Partial backport to help resolve conflicts.
- bitcoin/bitcoin#9060
- bitcoin/bitcoin#9223
- bitcoin/bitcoin#9644
  - Partial backport to help resolve conflicts.
- bitcoin/bitcoin#9916
- bitcoin/bitcoin#9750
- bitcoin/bitcoin#13176
- bitcoin/bitcoin#13948
- bitcoin/bitcoin#16073
- bitcoin/bitcoin#18670
- bitcoin/bitcoin#18806
  - Reveals upstream's covert fix for CVE-2013-5700.
- bitcoin/bitcoin#19968
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jun 27, 2021
@laanwj @Munkybooty
Merge bitcoin#13948: trivial: Removes unsed CBloomFilter constructor.
fa607b1 
265bd50 Removes unsed `CBloomFilter` constructor. (251)

Pull request description:

  This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.

Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba

# Conflicts:
#	src/bloom.h
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jun 29, 2021
@laanwj @Munkybooty
Merge bitcoin#13948: trivial: Removes unsed CBloomFilter constructor.
7fedcf1 
265bd50 Removes unsed `CBloomFilter` constructor. (251)

Pull request description:

  This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.

Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba

# Conflicts:
#	src/bloom.h
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jun 29, 2021
@laanwj @Munkybooty
Merge bitcoin#13948: trivial: Removes unsed CBloomFilter constructor.
12eacdd 
265bd50 Removes unsed `CBloomFilter` constructor. (251)

Pull request description:

  This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.

Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba

# Conflicts:
#	src/bloom.h
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jun 29, 2021
@laanwj @Munkybooty
Merge bitcoin#13948: trivial: Removes unsed CBloomFilter constructor.
07ba57c 
265bd50 Removes unsed `CBloomFilter` constructor. (251)

Pull request description:

  This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.

Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba

# Conflicts:
#	src/bloom.h
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jun 29, 2021
@laanwj @Munkybooty
Merge bitcoin#13948: trivial: Removes unsed CBloomFilter constructor.
87251d8 
265bd50 Removes unsed `CBloomFilter` constructor. (251)

Pull request description:

  This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.

Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba

# Conflicts:
#	src/bloom.h
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jun 30, 2021
@laanwj @Munkybooty
Merge bitcoin#13948: trivial: Removes unsed CBloomFilter constructor.
8a47abd 
265bd50 Removes unsed `CBloomFilter` constructor. (251)

Pull request description:

  This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.

Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba

# Conflicts:
#	src/bloom.h
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@l2a5b1 @Empact @practicalswift @domob1812 @fanquake @laanwj