mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#32485: Update minisketch subtree

Browse Source 
bf25a0918f Squashed 'src/minisketch/' changes from d1e6bb8bbf..ea8f66b1ea (fanquake)

Pull request description:

  Includes:
  * https://github.com/bitcoin-core/minisketch/pull/89
  * https://github.com/bitcoin-core/minisketch/pull/94 (in #32482)

ACKs for top commit:
  maflcko:
    lgtm ACK 46b533dfe6
  willcl-ark:
    ACK 46b533dfe6

Tree-SHA512: 7655aa480381c711fd3397fc7031be4619d5bd67f9d68f7e69f5f903734e776b97f7a2384257b365fc4e1f504b9c97acfd4a355840d1064d4c2c2f259070f4ef
This commit is contained in:
merge-script committed 2025-05-16 10:04:19 +01:00
2 parents 3afde679c3 46b533dfe6
commit c521192d8b
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/minisketch/include/minisketch.h
+4 -4
View File
@@ -115,12 +115,12 @@ MINISKETCH_API void minisketch_serialize(const minisketch* sketch, unsigned char
MINISKETCH_API void minisketch_deserialize(minisketch* sketch, const unsigned char* input); MINISKETCH_API void minisketch_deserialize(minisketch* sketch, const unsigned char* input);
/** Add an element to a sketch. /** Add an element to a sketch.
* *
* If the element to be added is too large for the sketch, the most significant * If the element to be added is too large for the sketch, the most significant
* bits of the element are dropped. More precisely, if the element size of * bits of the element are dropped. More precisely, if the element size of
* `sketch` is b bits, then this function adds the unsigned integer represented * `sketch` is b bits, then this function adds the unsigned integer represented
* by the b least significant bits of `element` to `sketch`. * by the b least significant bits of `element` to `sketch`.
* *
* If the element to be added is 0 (after potentially dropping the most significant * If the element to be added is 0 (after potentially dropping the most significant
* bits), then this function is a no-op. Sketches cannot contain an element with * bits), then this function is a no-op. Sketches cannot contain an element with
* the value 0. * the value 0.
@@ -248,8 +248,8 @@ public:
/** Check whether this Minisketch object is valid. */ /** Check whether this Minisketch object is valid. */
explicit operator bool() const noexcept { return bool{m_minisketch}; } explicit operator bool() const noexcept { return bool{m_minisketch}; }
/** Construct an (invalid) Minisketch object. */ /** Default constructor is deleted. */
Minisketch() noexcept = default; Minisketch() noexcept = delete;
/** Move constructor. */ /** Move constructor. */
Minisketch(Minisketch&&) noexcept = default; Minisketch(Minisketch&&) noexcept = default;