Merge pull request #160 from darosior/desc_pubkey_fixups

Descriptor pubkeys fixups

Author: sanket1729

src/descriptor/mod.rs

@@ -23,8 +23,8 @@
 //! these with BIP32 paths, pay-to-contract instructions, etc.
 //!
 
-use std::fmt;
 use std::str::{self, FromStr};
+use std::{error, fmt};
 
 use bitcoin::blockdata::{opcodes, script};
 use bitcoin::hashes::hash160;
@@ -104,6 +104,16 @@ impl fmt::Display for DescriptorKeyParseError {
     }
 }
 
+impl error::Error for DescriptorKeyParseError {
+    fn description(&self) -> &str {
+        ""
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
 impl fmt::Display for DescriptorPublicKey {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {

src/lib.rs

@@ -103,7 +103,7 @@ use std::{error, fmt, hash, str};
 use bitcoin::blockdata::{opcodes, script};
 use bitcoin::hashes::{hash160, sha256, Hash};
 
-pub use descriptor::{Descriptor, SatisfiedConstraints};
+pub use descriptor::{Descriptor, DescriptorPublicKey, SatisfiedConstraints};
 pub use miniscript::context::{Legacy, ScriptContext, Segwitv0};
 pub use miniscript::decode::Terminal;
 pub use miniscript::satisfy::{BitcoinSig, Satisfier};