Skip to content

Commit 8447e82

Browse files
committed
Merge #50: Bump nightly and add silent payments to ci
37bad3e Add silent payments to CI (Nick Johnson) 87602c1 Upgrade nightly to 2025-09-26 for public-api compatibility (Nick Johnson) Pull request description: Taking the easy path with some ignores for now. This version matches what is in rust-bitcoin atm, but does have me wondering why it is a bit old. ACKs for top commit: tcharding: ACK 37bad3e Tree-SHA512: 88a43e71a6dfa0dda90ebb16101b7117c8ff115da7c66fcb613cb3974df7f9f45942c57ccead291148f63100db4e1ed1ef64ea5fc2c73df6524f69cacbe90488
2 parents d5a656d + 37bad3e commit 8447e82

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

nightly-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2025-01-21
1+
nightly-2025-09-26

rbmt.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ examples = [
1111

1212
# Features to test with the conventional `std` feature enabled.
1313
# Tests each feature alone with std, all pairs, and all together.
14-
features_with_std = ["rand", "serde", "base64", "miniscript"]
14+
features_with_std = ["rand", "serde", "base64", "miniscript", "silent-payments"]
1515

1616
# Features to test without the `std` feature.
1717
# Tests each feature alone, all pairs, and all together.
1818
# Note: rand is a little weird until we can upgrade secp256k1 to v0.30.0
1919
# Note: miniscript is not included here as it has its own no-std handling
20-
features_without_std = ["serde", "base64"]
20+
features_without_std = ["serde", "base64", "silent-payments"]

src/v0/bitcoin/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ impl Psbt {
134134
/// An alias for [`extract_tx_fee_rate_limit`].
135135
///
136136
/// [`extract_tx_fee_rate_limit`]: Psbt::extract_tx_fee_rate_limit
137+
#[allow(clippy::result_large_err)]
137138
pub fn extract_tx(self) -> Result<Transaction, ExtractTxError> {
138139
self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE)
139140
}
@@ -145,6 +146,7 @@ impl Psbt {
145146
/// [`ExtractTxError`] variants will contain either the [`Psbt`] itself or the [`Transaction`]
146147
/// that was extracted. These can be extracted from the Errors in order to recover.
147148
/// See the error documentation for info on the variants. In general, it covers large fees.
149+
#[allow(clippy::result_large_err)]
148150
pub fn extract_tx_fee_rate_limit(self) -> Result<Transaction, ExtractTxError> {
149151
self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE)
150152
}
@@ -156,6 +158,7 @@ impl Psbt {
156158
/// See [`extract_tx`].
157159
///
158160
/// [`extract_tx`]: Psbt::extract_tx
161+
#[allow(clippy::result_large_err)]
159162
pub fn extract_tx_with_fee_rate_limit(
160163
self,
161164
max_fee_rate: FeeRate,
@@ -183,6 +186,7 @@ impl Psbt {
183186
}
184187

185188
#[inline]
189+
#[allow(clippy::result_large_err)]
186190
fn internal_extract_tx_with_fee_rate_limit(
187191
self,
188192
max_fee_rate: FeeRate,
@@ -1038,6 +1042,7 @@ impl From<sighash::TaprootError> for SignError {
10381042
/// This error is returned when extracting a [`Transaction`] from a [`Psbt`].
10391043
#[derive(Debug, Clone, PartialEq, Eq)]
10401044
#[non_exhaustive]
1045+
#[allow(clippy::result_large_err)]
10411046
pub enum ExtractTxError {
10421047
/// The [`FeeRate`] is too high
10431048
AbsurdFeeRate {

src/v2/extract.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ impl Extractor {
7878
/// Perform [`Self::extract_tx_fee_rate_limit`] without the fee rate check.
7979
///
8080
/// This can result in a transaction with absurdly high fees. Use with caution.
81+
#[allow(clippy::result_large_err)]
8182
pub fn extract_tx_unchecked_fee_rate(&self) -> Result<Transaction, ExtractTxError> {
8283
self.internal_extract_tx()
8384
}
@@ -105,6 +106,7 @@ impl Extractor {
105106
///
106107
/// Uses `miniscript` to do interpreter checks.
107108
#[inline]
109+
#[allow(clippy::result_large_err)]
108110
fn internal_extract_tx(&self) -> Result<Transaction, ExtractTxError> {
109111
if !self.0.is_finalized() {
110112
return Err(ExtractTxError::Unfinalized);

0 commit comments

Comments
 (0)