Merge bitcoindevkit/bdk#1294: Expose SpkIterator::new_with_range
8305e648494cbdd1f6438904ec367f8442fba606 feat(chain): expose `SpkIterator::new_with_range` (志宇) Pull request description: ### Description This method is useful, I'm not sure why it is not public. I've also updated the docs and tests. ### Changelog notice Added * Expose `SpkIterator::new_with_range` ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing #### New Features: * [x] I've added tests for the new feature * [x] I've added docs for the new feature ACKs for top commit: danielabrozzoni: utACK 8305e648494cbdd1f6438904ec367f8442fba606 LLFourn: ACK 8305e648494cbdd1f6438904ec367f8442fba606 Tree-SHA512: 26389bf65bea74742ebb4d170f3d21aeb02e5be1b3fd20ef16eb318393145809d2b21b96767ebb42acfd8dd789a82bb2d7b29ded24249dabf06bd1e6d23cf0cf
This commit is contained in:
commit
48b28e3abc
@ -43,18 +43,24 @@ impl<D> SpkIterator<D>
|
|||||||
where
|
where
|
||||||
D: Borrow<Descriptor<DescriptorPublicKey>>,
|
D: Borrow<Descriptor<DescriptorPublicKey>>,
|
||||||
{
|
{
|
||||||
/// Creates a new script pubkey iterator starting at 0 from a descriptor.
|
/// Create a new script pubkey iterator from `descriptor`.
|
||||||
|
///
|
||||||
|
/// This iterates from derivation index 0 and stops at index 0x7FFFFFFF (as specified in
|
||||||
|
/// BIP-32). Non-wildcard descriptors will only return one script pubkey at derivation index 0.
|
||||||
|
///
|
||||||
|
/// Use [`new_with_range`](SpkIterator::new_with_range) to create an iterator with a specified
|
||||||
|
/// derivation index range.
|
||||||
pub fn new(descriptor: D) -> Self {
|
pub fn new(descriptor: D) -> Self {
|
||||||
SpkIterator::new_with_range(descriptor, 0..=BIP32_MAX_INDEX)
|
SpkIterator::new_with_range(descriptor, 0..=BIP32_MAX_INDEX)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creates a new script pubkey iterator from a descriptor with a given range.
|
/// Create a new script pubkey iterator from `descriptor` and a given `range`.
|
||||||
// If the descriptor doesn't have a wildcard, we shorten whichever range you pass in
|
///
|
||||||
// to have length <= 1. This means that if you pass in 0..0 or 0..1 the range will
|
/// Non-wildcard descriptors will only emit a single script pubkey (at derivation index 0).
|
||||||
// remain the same, but if you pass in 0..10, we'll shorten it to 0..1
|
/// Wildcard descriptors have an end-bound of 0x7FFFFFFF (inclusive).
|
||||||
// Also note that if the descriptor doesn't have a wildcard, passing in a range starting
|
///
|
||||||
// from n > 0, will return an empty iterator.
|
/// Refer to [`new`](SpkIterator::new) for more.
|
||||||
pub(crate) fn new_with_range<R>(descriptor: D, range: R) -> Self
|
pub fn new_with_range<R>(descriptor: D, range: R) -> Self
|
||||||
where
|
where
|
||||||
R: RangeBounds<u32>,
|
R: RangeBounds<u32>,
|
||||||
{
|
{
|
||||||
@ -73,13 +79,6 @@ where
|
|||||||
// Because `end` is exclusive, we want the maximum value to be BIP32_MAX_INDEX + 1.
|
// Because `end` is exclusive, we want the maximum value to be BIP32_MAX_INDEX + 1.
|
||||||
end = end.min(BIP32_MAX_INDEX + 1);
|
end = end.min(BIP32_MAX_INDEX + 1);
|
||||||
|
|
||||||
if !descriptor.borrow().has_wildcard() {
|
|
||||||
// The length of the range should be at most 1
|
|
||||||
if end != start {
|
|
||||||
end = start + 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
next_index: start,
|
next_index: start,
|
||||||
end,
|
end,
|
||||||
@ -250,6 +249,14 @@ mod test {
|
|||||||
SpkIterator::new_with_range(&no_wildcard_descriptor, 1..=2).next(),
|
SpkIterator::new_with_range(&no_wildcard_descriptor, 1..=2).next(),
|
||||||
None
|
None
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
SpkIterator::new_with_range(&no_wildcard_descriptor, 10..11).next(),
|
||||||
|
None
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
SpkIterator::new_with_range(&no_wildcard_descriptor, 10..=10).next(),
|
||||||
|
None
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// The following dummy traits were created to test if SpkIterator is working properly.
|
// The following dummy traits were created to test if SpkIterator is working properly.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user