Skip to content

Commit a9888de

Browse files
committed
Merge #826: plan: remove unused AssetProvider::provider_lookup_tap_control_block_map
4205294 plan: remove unused AssetProvider::provider_lookup_tap_control_block_map (Marko Bencun) Pull request description: Was not sure if/when/how to implement it, when I noticed it's not needed at all. ACKs for top commit: apoelstra: ACK 4205294; successfully ran local tests Tree-SHA512: d0067ef38b5ad84a3d5ef66a437e60c1f6bec17c937ad758789308b981be8f0a20467f9288a8693acbd62893580989233cb85ba005ca57b8fcb59064edd598c6
2 parents f023c39 + 4205294 commit a9888de

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

src/plan.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ pub trait AssetProvider<Pk: MiniscriptKey> {
5353
/// and return its size
5454
fn provider_lookup_tap_leaf_script_sig(&self, _: &Pk, _: &TapLeafHash) -> Option<usize> { None }
5555

56-
/// Obtain a reference to the control block for a ver and script
57-
fn provider_lookup_tap_control_block_map(
58-
&self,
59-
) -> Option<&BTreeMap<ControlBlock, (bitcoin::ScriptBuf, LeafVersion)>> {
60-
None
61-
}
62-
6356
/// Given a raw `Pkh`, lookup corresponding [`bitcoin::PublicKey`]
6457
fn provider_lookup_raw_pkh_pk(&self, _: &hash160::Hash) -> Option<bitcoin::PublicKey> { None }
6558

@@ -133,7 +126,6 @@ impl AssetProvider<DefiniteDescriptorKey> for LoggerAssetProvider<'_> {
133126
impl_log_method!(provider_lookup_ecdsa_sig, pk: &DefiniteDescriptorKey, -> bool);
134127
impl_log_method!(provider_lookup_tap_key_spend_sig, pk: &DefiniteDescriptorKey, -> Option<usize>);
135128
impl_log_method!(provider_lookup_tap_leaf_script_sig, pk: &DefiniteDescriptorKey, leaf_hash: &TapLeafHash, -> Option<usize>);
136-
impl_log_method!(provider_lookup_tap_control_block_map, -> Option<&BTreeMap<ControlBlock, (bitcoin::ScriptBuf, LeafVersion)>>);
137129
impl_log_method!(provider_lookup_raw_pkh_pk, hash: &hash160::Hash, -> Option<bitcoin::PublicKey>);
138130
impl_log_method!(provider_lookup_raw_pkh_x_only_pk, hash: &hash160::Hash, -> Option<XOnlyPublicKey>);
139131
impl_log_method!(provider_lookup_raw_pkh_ecdsa_sig, hash: &hash160::Hash, -> Option<bitcoin::PublicKey>);
@@ -167,12 +159,6 @@ where
167159
Satisfier::lookup_tap_leaf_script_sig(self, pk, leaf_hash).map(|s| s.to_vec().len())
168160
}
169161

170-
fn provider_lookup_tap_control_block_map(
171-
&self,
172-
) -> Option<&BTreeMap<ControlBlock, (bitcoin::ScriptBuf, LeafVersion)>> {
173-
Satisfier::lookup_tap_control_block_map(self)
174-
}
175-
176162
fn provider_lookup_raw_pkh_pk(&self, hash: &hash160::Hash) -> Option<bitcoin::PublicKey> {
177163
Satisfier::lookup_raw_pkh_pk(self, hash)
178164
}

0 commit comments

Comments
 (0)