Skip to content

refactor: rename merge_networks to intersect_networks #324

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: rename merge_networks to intersect_networks #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/descriptor/dsl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ macro_rules! impl_top_level_tr {
)| {
key_map.extend(tree_keymap.into_iter());
valid_networks =
$crate::keys::merge_networks(&valid_networks, &tree_networks);
$crate::keys::intersect_networks(&valid_networks, &tree_networks);

tap_tree
},
Expand Down Expand Up @@ -209,7 +209,7 @@ macro_rules! impl_node_opcode_two {

minisc.check_miniscript()?;

Ok((minisc, a_keymap, $crate::keys::merge_networks(&a_networks, &b_networks)))
Ok((minisc, a_keymap, $crate::keys::intersect_networks(&a_networks, &b_networks)))
})
});
}
Expand All @@ -230,8 +230,8 @@ macro_rules! impl_node_opcode_three {
a_keymap.extend(b_keymap.into_iter());
a_keymap.extend(c_keymap.into_iter());

let networks = $crate::keys::merge_networks(&a_networks, &b_networks);
let networks = $crate::keys::merge_networks(&networks, &c_networks);
let networks = $crate::keys::intersect_networks(&a_networks, &b_networks);
let networks = $crate::keys::intersect_networks(&networks, &c_networks);

let minisc = $crate::miniscript::Miniscript::from_ast($crate::miniscript::miniscript::decode::Terminal::$terminal_variant(
$crate::alloc::sync::Arc::new(a_minisc),
Expand Down Expand Up @@ -280,7 +280,7 @@ macro_rules! parse_tap_tree {
.and_then(|tree_a| Ok((tree_a, $tree_b?)))
.and_then(|((a_tree, mut a_keymap, a_networks), (b_tree, b_keymap, b_networks))| {
a_keymap.extend(b_keymap.into_iter());
Ok((TapTree::combine(a_tree, b_tree), a_keymap, $crate::keys::merge_networks(&a_networks, &b_networks)))
Ok((TapTree::combine(a_tree, b_tree), a_keymap, $crate::keys::intersect_networks(&a_networks, &b_networks)))
})

}};
Expand Down Expand Up @@ -755,7 +755,7 @@ macro_rules! fragment {

let (key_maps, valid_networks) = key_maps_networks.into_iter().fold((KeyMap::default(), $crate::keys::any_network()), |(mut keys_acc, net_acc), (key, net)| {
keys_acc.extend(key.into_iter());
let net_acc = $crate::keys::merge_networks(&net_acc, &net);
let net_acc = $crate::keys::intersect_networks(&net_acc, &net);

(keys_acc, net_acc)
});
Expand Down
4 changes: 2 additions & 2 deletions src/keys/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub fn test_networks() -> ValidNetworks {
.collect()
}
/// Compute the intersection of two sets
pub fn merge_networks(a: &ValidNetworks, b: &ValidNetworks) -> ValidNetworks {
pub fn intersect_networks(a: &ValidNetworks, b: &ValidNetworks) -> ValidNetworks {
a.intersection(b).cloned().collect()
}

Expand Down Expand Up @@ -790,7 +790,7 @@ fn expand_multi_keys<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
(KeyMap::default(), any_network()),
|(mut keys_acc, net_acc), (key, net)| {
keys_acc.extend(key);
let net_acc = merge_networks(&net_acc, &net);
let net_acc = intersect_networks(&net_acc, &net);

(keys_acc, net_acc)
},
Expand Down
Loading