Skip to content

Commit caba61b

Browse files
committed
Move abstract::Policy to crate/abstract/mod.rs
The abstract policy is different from the concrete policy because it is only part of rust-miniscript and not miniscript in general. To help differentiate it move it to a separate module. Note to reviewers, `git` couldn't work out that this is basically a file move so I've left the `src/policy/abstract.rs` file in the repo but it is not included in the build. Reviewers can do `diff src/policy/abstract.rs src/abstract/mod.rs` to ease review. It will be removed in the next patch.
1 parent ff3ae26 commit caba61b

File tree

10 files changed

+970
-17
lines changed

10 files changed

+970
-17
lines changed

fuzz/fuzz_targets/roundtrip_semantic.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use std::str::FromStr;
22

33
use honggfuzz::fuzz;
4-
use miniscript::policy;
54

6-
type Policy = policy::r#abstract::Policy<String>;
5+
type Policy = miniscript::r#abstract::Policy<String>;
76

87
fn do_test(data: &[u8]) {
98
let data_str = String::from_utf8_lossy(data);

src/abstract/lift.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::error;
1515
use crate::descriptor::Descriptor;
1616
use crate::miniscript::{Miniscript, ScriptContext};
1717
use crate::policy::concrete::Policy as Concrete;
18-
use crate::policy::r#abstract::Policy as Abstract;
18+
use crate::r#abstract::Policy as Abstract;
1919
use crate::sync::Arc;
2020
use crate::{Error, MiniscriptKey, Terminal};
2121

@@ -227,7 +227,7 @@ mod tests {
227227
use crate::{descriptor::TapTree, Descriptor, Tap};
228228

229229
type ConcretePol = crate::policy::concrete::Policy<String>;
230-
type AbstractPol = crate::policy::r#abstract::Policy<String>;
230+
type AbstractPol = crate::r#abstract::Policy<String>;
231231

232232
fn concrete_policy_rtt(s: &str) {
233233
let conc = ConcretePol::from_str(s).unwrap();

0 commit comments

Comments
 (0)