Skip to content

Implement TreeLike for policy::Concrete #594

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

Merged
merged 16 commits into from
Sep 27, 2023
+360 −337
Merged

Implement TreeLike for policy::Concrete #594

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
82c0eee
Remove PolicyArc
tcharding Sep 20, 2023
277b587
Implement TreeLike for policy::Concrete
tcharding Sep 20, 2023
578dc69
Remove code comment from soon-to-be duplicated pattern
tcharding Sep 21, 2023
4d22908
Add basic unit test for translate_unsatisfiable_pk
tcharding Sep 21, 2023
2b11f64
Use TreeLike to implement translate_unsatisfiable_pk
tcharding Sep 21, 2023
984576c
Add basic unit test for keys
tcharding Sep 21, 2023
b7f8939
Use TreeLike to implement keys
tcharding Sep 21, 2023
3fc604a
Add basic unit test for num_tap_leaves
tcharding Sep 21, 2023
9280db2
Use TreeLike to implement num_tap_leaves
tcharding Sep 21, 2023
b3c0955
Add unit test coverage for_each_key
tcharding Sep 21, 2023
c81389f
Use TreeLike to implement for_each_key
tcharding Sep 21, 2023
3282193
Add basic unit test for translate_pk
tcharding Sep 21, 2023
64488d6
Use TreeLike to implement translate_pk
tcharding Sep 21, 2023
1cbc018
Add unit test for check_timelocks API
tcharding Sep 21, 2023
4749931
Use TreeLike to implement check_timelocks_helper
tcharding Sep 21, 2023
1efc7a3
Refactor check_timelocks helper
tcharding Sep 21, 2023
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
28 changes: 27 additions & 1 deletion src/iter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub use tree::{
};

use crate::sync::Arc;
use crate::{Miniscript, MiniscriptKey, ScriptContext, Terminal};
use crate::{policy, Miniscript, MiniscriptKey, ScriptContext, Terminal};

impl<'a, Pk: MiniscriptKey, Ctx: ScriptContext> TreeLike for &'a Miniscript<Pk, Ctx> {
fn as_node(&self) -> Tree<Self> {
Expand Down Expand Up @@ -68,3 +68,29 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> TreeLike for Arc<Miniscript<Pk, Ctx>
}
}
}

impl<'a, Pk: MiniscriptKey> TreeLike for &'a policy::Concrete<Pk> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really not a concern for this PR, but I think policy stuff should belong in policy module. Not here. See #603 for more.

fn as_node(&self) -> Tree<Self> {
use policy::Concrete::*;
match *self {
Unsatisfiable | Trivial | Key(_) | After(_) | Older(_) | Sha256(_) | Hash256(_)
| Ripemd160(_) | Hash160(_) => Tree::Nullary,
And(ref subs) => Tree::Nary(subs.iter().map(Arc::as_ref).collect()),
Or(ref v) => Tree::Nary(v.iter().map(|(_, p)| p.as_ref()).collect()),
Threshold(_, ref subs) => Tree::Nary(subs.iter().map(Arc::as_ref).collect()),
}
}
}

impl<'a, Pk: MiniscriptKey> TreeLike for Arc<policy::Concrete<Pk>> {
fn as_node(&self) -> Tree<Self> {
use policy::Concrete::*;
match self.as_ref() {
Unsatisfiable | Trivial | Key(_) | After(_) | Older(_) | Sha256(_) | Hash256(_)
| Ripemd160(_) | Hash160(_) => Tree::Nullary,
And(ref subs) => Tree::Nary(subs.iter().map(Arc::clone).collect()),
Or(ref v) => Tree::Nary(v.iter().map(|(_, p)| Arc::clone(p)).collect()),
Threshold(_, ref subs) => Tree::Nary(subs.iter().map(Arc::clone).collect()),
}
}
}