Skip to content

Commit

Permalink
Fix bad serialization import
Browse files Browse the repository at this point in the history
  • Loading branch information
justinmoon committed Nov 10, 2020
1 parent cd4ad73 commit 048f243
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/descriptor/mod.rs
Expand Up @@ -29,15 +29,12 @@ use std::{
str::{self, FromStr},
};

use bitcoin::blockdata::{opcodes, script};
use bitcoin::hashes::hash160;
use bitcoin::hashes::hex::FromHex;
use bitcoin::secp256k1;
use bitcoin::util::bip32;
use bitcoin::{self, Script};
use bitcoin::{
blockdata::{opcodes, script},
util::psbt::serialize::Serialize,
};

use expression;
use miniscript;
Expand Down Expand Up @@ -1040,8 +1037,9 @@ impl<Pk: MiniscriptKey + ToPublicKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx
// Sort pubkeys lexigraphically according to BIP 67
pks.sort_by(|a, b| {
a.to_public_key()
.key
.serialize()
.partial_cmp(&b.to_public_key().serialize())
.partial_cmp(&b.to_public_key().key.serialize())
.unwrap()
});
Terminal::Multi(self.k, pks)
Expand Down

0 comments on commit 048f243

Please sign in to comment.