DescriptorTypes moved to LNP/BP Core Lib

Author: dr-orlovsky

Cargo.lock

@@ -51,7 +51,7 @@ impl From<miniscript::Error> for Error {
 pub struct DescriptorGenerator {
     pub name: String,
     pub content: DescriptorContent,
-    pub types: DescriptorTypes,
+    pub types: descriptor::Variants,
 }
 
 impl DescriptorGenerator {
@@ -166,30 +166,6 @@ impl DescriptorGenerator {
     }
 }
 
-#[derive(
-    Clone, PartialEq, Eq, PartialOrd, Ord, Debug, StrictEncode, StrictDecode,
-)]
-pub struct DescriptorTypes {
-    pub bare: bool,
-    pub hashed: bool,
-    pub nested: bool,
-    pub segwit: bool,
-    pub taproot: bool,
-}
-
-impl DescriptorTypes {
-    pub fn has_match(&self, descriptor_type: descriptor::Category) -> bool {
-        match descriptor_type {
-            descriptor::Category::Bare => self.bare,
-            descriptor::Category::Hashed => self.hashed,
-            descriptor::Category::Nested => self.nested,
-            descriptor::Category::SegWit => self.segwit,
-            descriptor::Category::Taproot => self.taproot,
-            _ => false,
-        }
-    }
-}
-
 #[derive(
     Clone,
     PartialEq,

src/model/descriptors.rs

@@ -18,8 +18,8 @@ mod tracking;
 mod utxo;
 
 pub use descriptors::{
-    DescriptorContent, DescriptorGenerator, DescriptorTypes,
-    Error as DescriptorError, SourceType,
+    DescriptorContent, DescriptorGenerator, Error as DescriptorError,
+    SourceType,
 };
 pub use document::{Document, Error, Profile, ResolverError};
 pub use tracking::{

src/model/mod.rs

@@ -17,10 +17,12 @@ use std::collections::HashSet;
 use std::rc::Rc;
 use std::str::FromStr;
 
+use lnpbp::bp::descriptor;
+
 use crate::controller::utxo_lookup::{self, UtxoLookup};
 use crate::model::{
-    DescriptorContent, DescriptorGenerator, DescriptorTypes, Document,
-    ResolverError, SourceType, TrackingAccount, TrackingKey, UtxoEntry,
+    DescriptorContent, DescriptorGenerator, Document, ResolverError,
+    SourceType, TrackingAccount, TrackingKey, UtxoEntry,
 };
 use crate::util::resolver_mode::{self, ResolverModeType};
 use crate::view_controller::PubkeySelectDlg;
@@ -501,8 +503,8 @@ impl DescriptorDlg {
         Ok(content)
     }
 
-    pub fn descriptor_types(&self) -> DescriptorTypes {
-        DescriptorTypes {
+    pub fn descriptor_types(&self) -> descriptor::Variants {
+        descriptor::Variants {
             bare: self.bare_check.get_active(),
             hashed: self.hash_check.get_active(),
             nested: self.compat_check.get_active(),