Skip to content

Commit 99bd444

Browse files
committed
boxing the heavyweight ExtractTxError
1 parent 03f6bc6 commit 99bd444

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

.github/workflows/cont_integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
rust:
13-
- 1.81.0 # current
13+
- 1.89.0 # current
1414
- 1.63.0 # MSRV
1515
steps:
1616
- name: checkout
@@ -48,7 +48,7 @@ jobs:
4848
cargo update -p base64ct --precise "1.6.0"
4949
cargo update -p minreq --precise "2.13.2"
5050
cargo update -p bdk_electrum --precise 0.20.1
51-
cargo update -p rustls:0.23.26 --precise 0.23.12
51+
cargo update -p rustls:0.23.28 --precise 0.23.12
5252
- name: Build
5353
run: cargo build
5454
- name: Clippy

Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.81-bookworm
1+
FROM rust:1.87-bookworm
22
ARG http_proxy
33
ENV http_proxy=$http_proxy
44
ENV https_proxy=$http_proxy
@@ -35,7 +35,4 @@ WORKDIR /home/satoshi
3535

3636
RUN rustup component add clippy-preview \
3737
&& rustup component add rustfmt
38-
RUN rustup target add wasm32-unknown-unknown
39-
RUN rustup target add wasm32-wasi
40-
RUN rustup target add wasm32-unknown-emscripten
4138

Dockerfile_63

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,4 @@ WORKDIR /home/satoshi
3434

3535
RUN rustup component add clippy-preview \
3636
&& rustup component add rustfmt
37-
RUN rustup target add wasm32-unknown-unknown
38-
RUN rustup target add wasm32-wasi
3937

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test_63: builder_63
2626
$(DOCKER_RUN) ${TAG_63} cargo update -p base64ct --precise "1.6.0" || true
2727
$(DOCKER_RUN) ${TAG_63} cargo update -p minreq --precise "2.13.2" || true
2828
$(DOCKER_RUN) ${TAG_63} cargo update -p bdk_electrum --precise 0.20.1 || true
29-
$(DOCKER_RUN) ${TAG_63} cargo update -p rustls:0.23.26 --precise 0.23.12 || true
29+
$(DOCKER_RUN) ${TAG_63} cargo update -p rustls:0.23.28 --precise 0.23.12 || true
3030
$(DOCKER_RUN) ${TAG_63} cargo test
3131

3232
run: builder

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ cargo update -p once_cell --precise "1.20.3"
6565
cargo update -p base64ct --precise "1.6.0"
6666
cargo update -p minreq --precise "2.13.2"
6767
cargo update -p bdk_electrum --precise 0.20.1
68-
cargo update -p rustls:0.23.26 --precise 0.23.12
68+
cargo update -p rustls:0.23.28 --precise 0.23.12
6969
```
7070

7171
## Contribution

src/reserves.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub enum ProofError {
8686
/// Failed to create a transaction
8787
TxError(CreateTxError),
8888
/// Failed to extract TX from a PSBT
89-
TxExtraction(ExtractTxError),
89+
TxExtraction(Box<ExtractTxError>),
9090
/// Failed to construct a Wallet
9191
Wallet(bdk_wallet::descriptor::error::Error),
9292
/// Failed to sign a transaction
@@ -107,7 +107,7 @@ impl From<CreateTxError> for ProofError {
107107

108108
impl From<ExtractTxError> for ProofError {
109109
fn from(error: ExtractTxError) -> Self {
110-
ProofError::TxExtraction(error)
110+
ProofError::TxExtraction(Box::new(error))
111111
}
112112
}
113113

0 commit comments

Comments
 (0)