Merge #343: Use rust-bitcoin taproot max node count constant

b907cad Use rust-bitcoin taproot max node count constant (Duncan Dean)

Pull request description:

  Fixes #334

ACKs for top commit:
  sanket1729:
    utACK b907cad
  apoelstra:
    ACK b907cad

Tree-SHA512: 6b91917ebca1a1f971736fc52b580a0dbb749f033f2b23ece9e87a420e678b1edff54ffdc9258eebbf244ca091b9d52f536d531b75cd6250dd0dafe31cece3d0

Author: sanket1729

src/descriptor/tr.rs

@@ -9,12 +9,12 @@ use super::checksum::{desc_checksum, verify_checksum};
 use bitcoin::blockdata::opcodes;
 use bitcoin::util::taproot::{
     LeafVersion, TaprootBuilder, TaprootBuilderError, TaprootSpendInfo, TAPROOT_CONTROL_BASE_SIZE,
-    TAPROOT_CONTROL_NODE_SIZE,
+    TAPROOT_CONTROL_MAX_NODE_COUNT, TAPROOT_CONTROL_NODE_SIZE,
 };
 use bitcoin::{self, secp256k1, Script};
 use errstr;
 use expression::{self, FromTree};
-use miniscript::{limits::TAPROOT_MAX_NODE_COUNT, Miniscript};
+use miniscript::Miniscript;
 use std::cmp::{self, max};
 use std::hash;
 use std::sync::{Arc, Mutex};
@@ -173,7 +173,7 @@ impl<Pk: MiniscriptKey> Tr<Pk> {
     pub fn new(internal_key: Pk, tree: Option<TapTree<Pk>>) -> Result<Self, Error> {
         let nodes = tree.as_ref().map(|t| t.taptree_height()).unwrap_or(0);
 
-        if nodes <= TAPROOT_MAX_NODE_COUNT {
+        if nodes <= TAPROOT_CONTROL_MAX_NODE_COUNT {
             Ok(Self {
                 internal_key,
                 tree,

src/miniscript/limits.rs

@@ -50,6 +50,3 @@ pub const MAX_BLOCK_WEIGHT: usize = 4000000;
 /// Maximum pubkeys as arguments to CHECKMULTISIG
 // https://github.com/bitcoin/bitcoin/blob/6acda4b00b3fc1bfac02f5de590e1a5386cbc779/src/script/script.h#L30
 pub const MAX_PUBKEYS_PER_MULTISIG: usize = 20;
-/// Maximum number of scripts allowed by standardness rules in TapTree format
-// https://github.com/bitcoin/bitcoin/blob/81f4a3e84d6f30e7b12a9605dabc3359f614da93/src/script/interpreter.h#L229
-pub const TAPROOT_MAX_NODE_COUNT: usize = 128;