From e8250cd96ae80860b1602425f71eb66702d70614 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 20 Jun 2024 13:03:59 +1000 Subject: [PATCH 1/2] Remove InvalidInternalKey variant from TaprootBuilderError This variant is unused, remove it. Done as part of #2883. --- bitcoin/src/taproot/mod.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bitcoin/src/taproot/mod.rs b/bitcoin/src/taproot/mod.rs index 5fe0a16b1..74027057f 100644 --- a/bitcoin/src/taproot/mod.rs +++ b/bitcoin/src/taproot/mod.rs @@ -1337,8 +1337,6 @@ pub enum TaprootBuilderError { NodeNotInDfsOrder, /// Two nodes at depth 0 are not allowed. OverCompleteTree, - /// Invalid taproot internal key. - InvalidInternalKey(secp256k1::Error), /// Called finalize on a empty tree. EmptyTree, } @@ -1365,9 +1363,6 @@ impl fmt::Display for TaprootBuilderError { "Attempted to create a tree with two nodes at depth 0. There must\ only be a exactly one node at depth 0", ), - InvalidInternalKey(ref e) => { - write_err!(f, "invalid internal x-only key"; e) - } EmptyTree => { write!(f, "Called finalize on an empty tree") } @@ -1381,7 +1376,6 @@ impl std::error::Error for TaprootBuilderError { use TaprootBuilderError::*; match self { - InvalidInternalKey(e) => Some(e), InvalidMerkleTreeDepth(_) | NodeNotInDfsOrder | OverCompleteTree | EmptyTree => None, } } From 72655607b6b1213e744a86c0db37b79fa212cf38 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 20 Jun 2024 13:05:24 +1000 Subject: [PATCH 2/2] api: Run just check-api --- api/bitcoin/all-features.txt | 1 - api/bitcoin/default-features.txt | 1 - api/bitcoin/no-features.txt | 1 - 3 files changed, 3 deletions(-) diff --git a/api/bitcoin/all-features.txt b/api/bitcoin/all-features.txt index 35bdfcdb6..7f60f6c8a 100644 --- a/api/bitcoin/all-features.txt +++ b/api/bitcoin/all-features.txt @@ -5633,7 +5633,6 @@ pub bitcoin::taproot::Signature::signature: secp256k1::schnorr::Signature pub bitcoin::taproot::TapLeaf::Hidden(bitcoin::taproot::TapNodeHash) pub bitcoin::taproot::TapLeaf::Script(bitcoin::blockdata::script::ScriptBuf, bitcoin::taproot::LeafVersion) pub bitcoin::taproot::TaprootBuilderError::EmptyTree -pub bitcoin::taproot::TaprootBuilderError::InvalidInternalKey(secp256k1::Error) pub bitcoin::taproot::TaprootBuilderError::InvalidMerkleTreeDepth(usize) pub bitcoin::taproot::TaprootBuilderError::NodeNotInDfsOrder pub bitcoin::taproot::TaprootBuilderError::OverCompleteTree diff --git a/api/bitcoin/default-features.txt b/api/bitcoin/default-features.txt index 244a5c7b3..96a29bd2e 100644 --- a/api/bitcoin/default-features.txt +++ b/api/bitcoin/default-features.txt @@ -5353,7 +5353,6 @@ pub bitcoin::taproot::Signature::signature: secp256k1::schnorr::Signature pub bitcoin::taproot::TapLeaf::Hidden(bitcoin::taproot::TapNodeHash) pub bitcoin::taproot::TapLeaf::Script(bitcoin::blockdata::script::ScriptBuf, bitcoin::taproot::LeafVersion) pub bitcoin::taproot::TaprootBuilderError::EmptyTree -pub bitcoin::taproot::TaprootBuilderError::InvalidInternalKey(secp256k1::Error) pub bitcoin::taproot::TaprootBuilderError::InvalidMerkleTreeDepth(usize) pub bitcoin::taproot::TaprootBuilderError::NodeNotInDfsOrder pub bitcoin::taproot::TaprootBuilderError::OverCompleteTree diff --git a/api/bitcoin/no-features.txt b/api/bitcoin/no-features.txt index 7df5c578a..c3d1558a2 100644 --- a/api/bitcoin/no-features.txt +++ b/api/bitcoin/no-features.txt @@ -4736,7 +4736,6 @@ pub bitcoin::taproot::Signature::signature: secp256k1::schnorr::Signature pub bitcoin::taproot::TapLeaf::Hidden(bitcoin::taproot::TapNodeHash) pub bitcoin::taproot::TapLeaf::Script(bitcoin::blockdata::script::ScriptBuf, bitcoin::taproot::LeafVersion) pub bitcoin::taproot::TaprootBuilderError::EmptyTree -pub bitcoin::taproot::TaprootBuilderError::InvalidInternalKey(secp256k1::Error) pub bitcoin::taproot::TaprootBuilderError::InvalidMerkleTreeDepth(usize) pub bitcoin::taproot::TaprootBuilderError::NodeNotInDfsOrder pub bitcoin::taproot::TaprootBuilderError::OverCompleteTree