Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 82bba20

Browse files
tchardingtcharding
committedAug 8, 2024··
Depend on the new bitcoind-json-rpc group of crates
There is an effort to improve the state of affairs in regards to integration testing extensively against multiple versions of Bitcoin Core. As part of this do: - Depend on the new `rust-bitcoind-json-rpc` crates - Run the integration tests against most versions of Core since 0.17.1 (Note the latest supported version is currently 26.0) This patch effects integration testing only and should hopefully help with our upgrade process because I will personally make sure the new crates are ready and tested during the rust-bitcoin RC cycle. Note that we exclude the integration test crate `bitcoind-tests` from within the manifest, this has the effect of not covering it during all the jobs that use `run_task`. It is explicitly used in the `Integration` job.
1 parent 0b71558 commit 82bba20

File tree

8 files changed

+122
-532
lines changed

8 files changed

+122
-532
lines changed
 

‎.github/workflows/rust.yml

+31-12
Original file line numberDiff line numberDiff line change
@@ -182,20 +182,39 @@ jobs:
182182
- name: "Check formatting"
183183
run: cargo +nightly fmt --all -- --check
184184

185-
Int-tests:
186-
name: Integration tests
185+
Integration: # 1 job for each bitcoind version we support.
186+
name: Integration tests - stable toolchain
187187
runs-on: ubuntu-latest
188+
strategy:
189+
fail-fast: false
190+
matrix:
191+
feature:
192+
[
193+
"26_0",
194+
"25_2",
195+
"25_1",
196+
"25_0",
197+
"24_2",
198+
"24_1",
199+
"24_0_1",
200+
"23_2",
201+
"23_1",
202+
"23_0",
203+
"22_1",
204+
"22_0",
205+
"0_21_2",
206+
"0_20_2",
207+
"0_19_1",
208+
"0_18_1",
209+
"0_17_1",
210+
]
188211
steps:
189-
- name: Checkout Crate
190-
uses: actions/checkout@v2
191-
- name: Checkout Toolchain
192-
uses: actions-rs/toolchain@v1
193-
with:
194-
profile: minimal
195-
toolchain: stable
196-
override: true
197-
- name: Running integration tests
198-
run: ./contrib/integration_test.sh
212+
- name: "Checkout repo"
213+
uses: actions/checkout@v4
214+
- name: "Select toolchain"
215+
uses: dtolnay/rust-toolchain@stable
216+
- name: "Run integration tests"
217+
run: cd bitcoind-tests && cargo test --features=${{ matrix.feature }}
199218

200219
Embedded:
201220
runs-on: ubuntu-latest

‎Cargo-minimal.lock

+11-245
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ dependencies = [
1111
"memchr",
1212
]
1313

14-
[[package]]
15-
name = "anyhow"
16-
version = "1.0.82"
17-
source = "registry+https://github.com/rust-lang/crates.io-index"
18-
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
19-
2014
[[package]]
2115
name = "arrayvec"
2216
version = "0.7.4"
@@ -29,16 +23,10 @@ version = "0.1.0"
2923
source = "registry+https://github.com/rust-lang/crates.io-index"
3024
checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
3125
dependencies = [
32-
"bitcoin-internals 0.3.0",
33-
"bitcoin_hashes 0.14.0",
26+
"bitcoin-internals",
27+
"bitcoin_hashes",
3428
]
3529

36-
[[package]]
37-
name = "base64"
38-
version = "0.13.1"
39-
source = "registry+https://github.com/rust-lang/crates.io-index"
40-
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
41-
4230
[[package]]
4331
name = "base64"
4432
version = "0.21.7"
@@ -58,24 +46,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
5846
checksum = "7170e7750a20974246f17ece04311b4205a6155f1db564c5b224af817663c3ea"
5947
dependencies = [
6048
"base58ck",
61-
"base64 0.21.7",
49+
"base64",
6250
"bech32",
63-
"bitcoin-internals 0.3.0",
51+
"bitcoin-internals",
6452
"bitcoin-io",
6553
"bitcoin-units",
66-
"bitcoin_hashes 0.14.0",
67-
"hex-conservative 0.2.1",
54+
"bitcoin_hashes",
55+
"hex-conservative",
6856
"hex_lit",
6957
"secp256k1",
7058
"serde",
7159
]
7260

73-
[[package]]
74-
name = "bitcoin-internals"
75-
version = "0.2.0"
76-
source = "registry+https://github.com/rust-lang/crates.io-index"
77-
checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
78-
7961
[[package]]
8062
name = "bitcoin-internals"
8163
version = "0.3.0"
@@ -97,89 +79,26 @@ version = "0.1.0"
9779
source = "registry+https://github.com/rust-lang/crates.io-index"
9880
checksum = "8d437fd727271c866d6fd5e71eb2c886437d4c97f80d89246be3189b1da4e58b"
9981
dependencies = [
100-
"bitcoin-internals 0.3.0",
82+
"bitcoin-internals",
10183
"serde",
10284
]
10385

104-
[[package]]
105-
name = "bitcoin_hashes"
106-
version = "0.13.0"
107-
source = "registry+https://github.com/rust-lang/crates.io-index"
108-
checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
109-
dependencies = [
110-
"bitcoin-internals 0.2.0",
111-
"hex-conservative 0.1.1",
112-
]
113-
11486
[[package]]
11587
name = "bitcoin_hashes"
11688
version = "0.14.0"
11789
source = "registry+https://github.com/rust-lang/crates.io-index"
11890
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
11991
dependencies = [
12092
"bitcoin-io",
121-
"hex-conservative 0.2.1",
93+
"hex-conservative",
12294
"serde",
12395
]
12496

125-
[[package]]
126-
name = "bitcoincore-rpc"
127-
version = "0.19.0"
128-
source = "registry+https://github.com/rust-lang/crates.io-index"
129-
checksum = "aedd23ae0fd321affb4bbbc36126c6f49a32818dc6b979395d24da8c9d4e80ee"
130-
dependencies = [
131-
"bitcoincore-rpc-json",
132-
"jsonrpc",
133-
"log",
134-
"serde",
135-
"serde_json",
136-
]
137-
138-
[[package]]
139-
name = "bitcoincore-rpc-json"
140-
version = "0.19.0"
141-
source = "registry+https://github.com/rust-lang/crates.io-index"
142-
checksum = "d8909583c5fab98508e80ef73e5592a651c954993dc6b7739963257d19f0e71a"
143-
dependencies = [
144-
"bitcoin",
145-
"serde",
146-
"serde_json",
147-
]
148-
149-
[[package]]
150-
name = "bitcoind"
151-
version = "0.36.0"
152-
source = "registry+https://github.com/rust-lang/crates.io-index"
153-
checksum = "3ee5cf6a9903ff9cc808494c1232b0e9f6eef6600913d0d69fe1cb5c428f25b9"
154-
dependencies = [
155-
"anyhow",
156-
"bitcoincore-rpc",
157-
"log",
158-
"tempfile",
159-
"which",
160-
]
161-
162-
[[package]]
163-
name = "bitcoind-tests"
164-
version = "0.1.0"
165-
dependencies = [
166-
"bitcoind",
167-
"miniscript",
168-
"rand",
169-
"secp256k1",
170-
]
171-
172-
[[package]]
173-
name = "bitflags"
174-
version = "1.3.2"
175-
source = "registry+https://github.com/rust-lang/crates.io-index"
176-
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
177-
17897
[[package]]
17998
name = "cc"
180-
version = "1.0.79"
99+
version = "1.0.28"
181100
source = "registry+https://github.com/rust-lang/crates.io-index"
182-
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
101+
checksum = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
183102

184103
[[package]]
185104
name = "cfg-if"
@@ -196,21 +115,6 @@ dependencies = [
196115
"regex",
197116
]
198117

199-
[[package]]
200-
name = "either"
201-
version = "1.11.0"
202-
source = "registry+https://github.com/rust-lang/crates.io-index"
203-
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
204-
205-
[[package]]
206-
name = "fastrand"
207-
version = "1.9.0"
208-
source = "registry+https://github.com/rust-lang/crates.io-index"
209-
checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
210-
dependencies = [
211-
"instant",
212-
]
213-
214118
[[package]]
215119
name = "getrandom"
216120
version = "0.2.14"
@@ -222,12 +126,6 @@ dependencies = [
222126
"wasi",
223127
]
224128

225-
[[package]]
226-
name = "hex-conservative"
227-
version = "0.1.1"
228-
source = "registry+https://github.com/rust-lang/crates.io-index"
229-
checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
230-
231129
[[package]]
232130
name = "hex-conservative"
233131
version = "0.2.1"
@@ -254,33 +152,6 @@ dependencies = [
254152
"rustc_version",
255153
]
256154

257-
[[package]]
258-
name = "instant"
259-
version = "0.1.12"
260-
source = "registry+https://github.com/rust-lang/crates.io-index"
261-
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
262-
dependencies = [
263-
"cfg-if",
264-
]
265-
266-
[[package]]
267-
name = "itoa"
268-
version = "1.0.11"
269-
source = "registry+https://github.com/rust-lang/crates.io-index"
270-
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
271-
272-
[[package]]
273-
name = "jsonrpc"
274-
version = "0.18.0"
275-
source = "registry+https://github.com/rust-lang/crates.io-index"
276-
checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
277-
dependencies = [
278-
"base64 0.13.1",
279-
"minreq",
280-
"serde",
281-
"serde_json",
282-
]
283-
284155
[[package]]
285156
name = "lazy_static"
286157
version = "1.4.0"
@@ -293,12 +164,6 @@ version = "0.2.154"
293164
source = "registry+https://github.com/rust-lang/crates.io-index"
294165
checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
295166

296-
[[package]]
297-
name = "log"
298-
version = "0.4.18"
299-
source = "registry+https://github.com/rust-lang/crates.io-index"
300-
checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
301-
302167
[[package]]
303168
name = "memchr"
304169
version = "2.5.0"
@@ -325,23 +190,6 @@ dependencies = [
325190
"serde_test",
326191
]
327192

328-
[[package]]
329-
name = "minreq"
330-
version = "2.7.0"
331-
source = "registry+https://github.com/rust-lang/crates.io-index"
332-
checksum = "41979ac2a5aa373c6e294b4a67fbe5e428e91a4cd0524376681f2bc6d872399b"
333-
dependencies = [
334-
"log",
335-
"serde",
336-
"serde_json",
337-
]
338-
339-
[[package]]
340-
name = "once_cell"
341-
version = "1.17.2"
342-
source = "registry+https://github.com/rust-lang/crates.io-index"
343-
checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
344-
345193
[[package]]
346194
name = "ppv-lite86"
347195
version = "0.2.17"
@@ -396,15 +244,6 @@ dependencies = [
396244
"getrandom",
397245
]
398246

399-
[[package]]
400-
name = "redox_syscall"
401-
version = "0.2.16"
402-
source = "registry+https://github.com/rust-lang/crates.io-index"
403-
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
404-
dependencies = [
405-
"bitflags",
406-
]
407-
408247
[[package]]
409248
name = "regex"
410249
version = "1.7.3"
@@ -422,15 +261,6 @@ version = "0.6.29"
422261
source = "registry+https://github.com/rust-lang/crates.io-index"
423262
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
424263

425-
[[package]]
426-
name = "remove_dir_all"
427-
version = "0.5.3"
428-
source = "registry+https://github.com/rust-lang/crates.io-index"
429-
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
430-
dependencies = [
431-
"winapi",
432-
]
433-
434264
[[package]]
435265
name = "rustc_version"
436266
version = "0.4.0"
@@ -440,19 +270,13 @@ dependencies = [
440270
"semver",
441271
]
442272

443-
[[package]]
444-
name = "ryu"
445-
version = "1.0.17"
446-
source = "registry+https://github.com/rust-lang/crates.io-index"
447-
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
448-
449273
[[package]]
450274
name = "secp256k1"
451275
version = "0.29.0"
452276
source = "registry+https://github.com/rust-lang/crates.io-index"
453277
checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
454278
dependencies = [
455-
"bitcoin_hashes 0.13.0",
279+
"bitcoin_hashes",
456280
"rand",
457281
"secp256k1-sys",
458282
"serde",
@@ -493,17 +317,6 @@ dependencies = [
493317
"syn",
494318
]
495319

496-
[[package]]
497-
name = "serde_json"
498-
version = "1.0.116"
499-
source = "registry+https://github.com/rust-lang/crates.io-index"
500-
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
501-
dependencies = [
502-
"itoa",
503-
"ryu",
504-
"serde",
505-
]
506-
507320
[[package]]
508321
name = "serde_test"
509322
version = "1.0.176"
@@ -524,20 +337,6 @@ dependencies = [
524337
"unicode-ident",
525338
]
526339

527-
[[package]]
528-
name = "tempfile"
529-
version = "3.3.0"
530-
source = "registry+https://github.com/rust-lang/crates.io-index"
531-
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
532-
dependencies = [
533-
"cfg-if",
534-
"fastrand",
535-
"libc",
536-
"redox_syscall",
537-
"remove_dir_all",
538-
"winapi",
539-
]
540-
541340
[[package]]
542341
name = "unicode-ident"
543342
version = "1.0.12"
@@ -549,36 +348,3 @@ name = "wasi"
549348
version = "0.11.0+wasi-snapshot-preview1"
550349
source = "registry+https://github.com/rust-lang/crates.io-index"
551350
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
552-
553-
[[package]]
554-
name = "which"
555-
version = "4.4.0"
556-
source = "registry+https://github.com/rust-lang/crates.io-index"
557-
checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
558-
dependencies = [
559-
"either",
560-
"libc",
561-
"once_cell",
562-
]
563-
564-
[[package]]
565-
name = "winapi"
566-
version = "0.3.9"
567-
source = "registry+https://github.com/rust-lang/crates.io-index"
568-
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
569-
dependencies = [
570-
"winapi-i686-pc-windows-gnu",
571-
"winapi-x86_64-pc-windows-gnu",
572-
]
573-
574-
[[package]]
575-
name = "winapi-i686-pc-windows-gnu"
576-
version = "0.4.0"
577-
source = "registry+https://github.com/rust-lang/crates.io-index"
578-
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
579-
580-
[[package]]
581-
name = "winapi-x86_64-pc-windows-gnu"
582-
version = "0.4.0"
583-
source = "registry+https://github.com/rust-lang/crates.io-index"
584-
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

‎Cargo-recent.lock

+3-215
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ dependencies = [
1111
"memchr",
1212
]
1313

14-
[[package]]
15-
name = "anyhow"
16-
version = "1.0.82"
17-
source = "registry+https://github.com/rust-lang/crates.io-index"
18-
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
19-
2014
[[package]]
2115
name = "arrayvec"
2216
version = "0.7.4"
@@ -33,12 +27,6 @@ dependencies = [
3327
"bitcoin_hashes",
3428
]
3529

36-
[[package]]
37-
name = "base64"
38-
version = "0.13.1"
39-
source = "registry+https://github.com/rust-lang/crates.io-index"
40-
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
41-
4230
[[package]]
4331
name = "base64"
4432
version = "0.21.7"
@@ -58,7 +46,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
5846
checksum = "7170e7750a20974246f17ece04311b4205a6155f1db564c5b224af817663c3ea"
5947
dependencies = [
6048
"base58ck",
61-
"base64 0.21.7",
49+
"base64",
6250
"bech32",
6351
"bitcoin-internals",
6452
"bitcoin-io",
@@ -106,64 +94,11 @@ dependencies = [
10694
"serde",
10795
]
10896

109-
[[package]]
110-
name = "bitcoincore-rpc"
111-
version = "0.19.0"
112-
source = "registry+https://github.com/rust-lang/crates.io-index"
113-
checksum = "aedd23ae0fd321affb4bbbc36126c6f49a32818dc6b979395d24da8c9d4e80ee"
114-
dependencies = [
115-
"bitcoincore-rpc-json",
116-
"jsonrpc",
117-
"log",
118-
"serde",
119-
"serde_json",
120-
]
121-
122-
[[package]]
123-
name = "bitcoincore-rpc-json"
124-
version = "0.19.0"
125-
source = "registry+https://github.com/rust-lang/crates.io-index"
126-
checksum = "d8909583c5fab98508e80ef73e5592a651c954993dc6b7739963257d19f0e71a"
127-
dependencies = [
128-
"bitcoin",
129-
"serde",
130-
"serde_json",
131-
]
132-
133-
[[package]]
134-
name = "bitcoind"
135-
version = "0.36.0"
136-
source = "registry+https://github.com/rust-lang/crates.io-index"
137-
checksum = "3ee5cf6a9903ff9cc808494c1232b0e9f6eef6600913d0d69fe1cb5c428f25b9"
138-
dependencies = [
139-
"anyhow",
140-
"bitcoincore-rpc",
141-
"log",
142-
"tempfile",
143-
"which",
144-
]
145-
146-
[[package]]
147-
name = "bitcoind-tests"
148-
version = "0.1.0"
149-
dependencies = [
150-
"bitcoind",
151-
"miniscript",
152-
"rand",
153-
"secp256k1",
154-
]
155-
156-
[[package]]
157-
name = "bitflags"
158-
version = "1.3.2"
159-
source = "registry+https://github.com/rust-lang/crates.io-index"
160-
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
161-
16297
[[package]]
16398
name = "cc"
164-
version = "1.0.79"
99+
version = "1.0.28"
165100
source = "registry+https://github.com/rust-lang/crates.io-index"
166-
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
101+
checksum = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
167102

168103
[[package]]
169104
name = "cfg-if"
@@ -180,21 +115,6 @@ dependencies = [
180115
"regex",
181116
]
182117

183-
[[package]]
184-
name = "either"
185-
version = "1.11.0"
186-
source = "registry+https://github.com/rust-lang/crates.io-index"
187-
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
188-
189-
[[package]]
190-
name = "fastrand"
191-
version = "1.9.0"
192-
source = "registry+https://github.com/rust-lang/crates.io-index"
193-
checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
194-
dependencies = [
195-
"instant",
196-
]
197-
198118
[[package]]
199119
name = "getrandom"
200120
version = "0.2.14"
@@ -232,33 +152,6 @@ dependencies = [
232152
"rustc_version",
233153
]
234154

235-
[[package]]
236-
name = "instant"
237-
version = "0.1.12"
238-
source = "registry+https://github.com/rust-lang/crates.io-index"
239-
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
240-
dependencies = [
241-
"cfg-if",
242-
]
243-
244-
[[package]]
245-
name = "itoa"
246-
version = "1.0.11"
247-
source = "registry+https://github.com/rust-lang/crates.io-index"
248-
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
249-
250-
[[package]]
251-
name = "jsonrpc"
252-
version = "0.18.0"
253-
source = "registry+https://github.com/rust-lang/crates.io-index"
254-
checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
255-
dependencies = [
256-
"base64 0.13.1",
257-
"minreq",
258-
"serde",
259-
"serde_json",
260-
]
261-
262155
[[package]]
263156
name = "lazy_static"
264157
version = "1.4.0"
@@ -271,12 +164,6 @@ version = "0.2.154"
271164
source = "registry+https://github.com/rust-lang/crates.io-index"
272165
checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
273166

274-
[[package]]
275-
name = "log"
276-
version = "0.4.18"
277-
source = "registry+https://github.com/rust-lang/crates.io-index"
278-
checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
279-
280167
[[package]]
281168
name = "memchr"
282169
version = "2.5.0"
@@ -303,23 +190,6 @@ dependencies = [
303190
"serde_test",
304191
]
305192

306-
[[package]]
307-
name = "minreq"
308-
version = "2.7.0"
309-
source = "registry+https://github.com/rust-lang/crates.io-index"
310-
checksum = "41979ac2a5aa373c6e294b4a67fbe5e428e91a4cd0524376681f2bc6d872399b"
311-
dependencies = [
312-
"log",
313-
"serde",
314-
"serde_json",
315-
]
316-
317-
[[package]]
318-
name = "once_cell"
319-
version = "1.17.2"
320-
source = "registry+https://github.com/rust-lang/crates.io-index"
321-
checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
322-
323193
[[package]]
324194
name = "ppv-lite86"
325195
version = "0.2.17"
@@ -374,15 +244,6 @@ dependencies = [
374244
"getrandom",
375245
]
376246

377-
[[package]]
378-
name = "redox_syscall"
379-
version = "0.2.16"
380-
source = "registry+https://github.com/rust-lang/crates.io-index"
381-
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
382-
dependencies = [
383-
"bitflags",
384-
]
385-
386247
[[package]]
387248
name = "regex"
388249
version = "1.7.3"
@@ -400,15 +261,6 @@ version = "0.6.29"
400261
source = "registry+https://github.com/rust-lang/crates.io-index"
401262
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
402263

403-
[[package]]
404-
name = "remove_dir_all"
405-
version = "0.5.3"
406-
source = "registry+https://github.com/rust-lang/crates.io-index"
407-
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
408-
dependencies = [
409-
"winapi",
410-
]
411-
412264
[[package]]
413265
name = "rustc_version"
414266
version = "0.4.0"
@@ -418,12 +270,6 @@ dependencies = [
418270
"semver",
419271
]
420272

421-
[[package]]
422-
name = "ryu"
423-
version = "1.0.17"
424-
source = "registry+https://github.com/rust-lang/crates.io-index"
425-
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
426-
427273
[[package]]
428274
name = "secp256k1"
429275
version = "0.29.0"
@@ -471,17 +317,6 @@ dependencies = [
471317
"syn",
472318
]
473319

474-
[[package]]
475-
name = "serde_json"
476-
version = "1.0.116"
477-
source = "registry+https://github.com/rust-lang/crates.io-index"
478-
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
479-
dependencies = [
480-
"itoa",
481-
"ryu",
482-
"serde",
483-
]
484-
485320
[[package]]
486321
name = "serde_test"
487322
version = "1.0.176"
@@ -502,20 +337,6 @@ dependencies = [
502337
"unicode-ident",
503338
]
504339

505-
[[package]]
506-
name = "tempfile"
507-
version = "3.3.0"
508-
source = "registry+https://github.com/rust-lang/crates.io-index"
509-
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
510-
dependencies = [
511-
"cfg-if",
512-
"fastrand",
513-
"libc",
514-
"redox_syscall",
515-
"remove_dir_all",
516-
"winapi",
517-
]
518-
519340
[[package]]
520341
name = "unicode-ident"
521342
version = "1.0.12"
@@ -527,36 +348,3 @@ name = "wasi"
527348
version = "0.11.0+wasi-snapshot-preview1"
528349
source = "registry+https://github.com/rust-lang/crates.io-index"
529350
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
530-
531-
[[package]]
532-
name = "which"
533-
version = "4.4.0"
534-
source = "registry+https://github.com/rust-lang/crates.io-index"
535-
checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
536-
dependencies = [
537-
"either",
538-
"libc",
539-
"once_cell",
540-
]
541-
542-
[[package]]
543-
name = "winapi"
544-
version = "0.3.9"
545-
source = "registry+https://github.com/rust-lang/crates.io-index"
546-
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
547-
dependencies = [
548-
"winapi-i686-pc-windows-gnu",
549-
"winapi-x86_64-pc-windows-gnu",
550-
]
551-
552-
[[package]]
553-
name = "winapi-i686-pc-windows-gnu"
554-
version = "0.4.0"
555-
source = "registry+https://github.com/rust-lang/crates.io-index"
556-
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
557-
558-
[[package]]
559-
name = "winapi-x86_64-pc-windows-gnu"
560-
version = "0.4.0"
561-
source = "registry+https://github.com/rust-lang/crates.io-index"
562-
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ name = "big"
6767
required-features = ["std", "base64", "compiler"]
6868

6969
[workspace]
70-
members = ["bitcoind-tests", "fuzz"]
71-
exclude = ["embedded"]
70+
members = ["fuzz"]
71+
exclude = ["embedded", "bitcoind-tests"]

‎bitcoind-tests/Cargo.toml

+21-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ publish = false
99

1010
[dependencies]
1111
miniscript = {path = "../"}
12-
bitcoind = { version = "0.36.0" }
12+
bitcoind = { package = "bitcoind-json-rpc-regtest", version = "0.3.0" }
1313
actual-rand = { package = "rand", version = "0.8.4"}
1414
secp256k1 = {version = "0.29.0", features = ["rand-std"]}
15+
16+
[features]
17+
# Enable the same feature in `bitcoind`.
18+
"26_0" = ["bitcoind/26_0"]
19+
"25_2" = ["bitcoind/25_2"]
20+
"25_1" = ["bitcoind/25_1"]
21+
"25_0" = ["bitcoind/25_0"]
22+
"24_2" = ["bitcoind/24_2"]
23+
"24_1" = ["bitcoind/24_1"]
24+
"24_0_1" = ["bitcoind/24_0_1"]
25+
"23_2" = ["bitcoind/23_2"]
26+
"23_1" = ["bitcoind/23_1"]
27+
"23_0" = ["bitcoind/23_0"]
28+
"22_1" = ["bitcoind/22_1"]
29+
"22_0" = ["bitcoind/22_0"]
30+
"0_21_2" = ["bitcoind/0_21_2"]
31+
"0_20_2" = ["bitcoind/0_20_2"]
32+
"0_19_1" = ["bitcoind/0_19_1"]
33+
"0_18_1" = ["bitcoind/0_18_1"]
34+
"0_17_1" = ["bitcoind/0_17_1"]

‎bitcoind-tests/tests/setup/mod.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
extern crate miniscript;
22

3-
use bitcoind::bitcoincore_rpc::RpcApi;
4-
use bitcoind::BitcoinD;
5-
use miniscript::bitcoin;
3+
use bitcoind::client::bitcoin;
64

75
pub mod test_util;
86

97
// Launch an instance of bitcoind with
10-
pub fn setup() -> BitcoinD {
8+
pub fn setup() -> bitcoind::BitcoinD {
119
// Create env var BITCOIND_EXE_PATH to point to the ../bitcoind/bin/bitcoind binary
1210
let key = "BITCOIND_EXE";
1311
if std::env::var(key).is_err() {
@@ -29,13 +27,15 @@ pub fn setup() -> BitcoinD {
2927
let bitcoind = bitcoind::BitcoinD::new(exe_path).unwrap();
3028
let cl = &bitcoind.client;
3129
// generate to an address by the wallet. And wait for funds to mature
32-
let addr = cl.get_new_address(None, None).unwrap().assume_checked();
30+
let addr = cl.new_address().unwrap();
3331
let blks = cl.generate_to_address(101, &addr).unwrap();
34-
assert_eq!(blks.len(), 101);
32+
assert_eq!(blks.0.len(), 101);
3533

36-
assert_eq!(
37-
cl.get_balance(Some(1) /*min conf*/, None).unwrap(),
38-
bitcoin::Amount::from_sat(100_000_000 * 50)
39-
);
34+
let balance = cl
35+
.get_balance()
36+
.expect("failed to get balance")
37+
.balance()
38+
.unwrap();
39+
assert_eq!(balance, bitcoin::Amount::from_sat(100_000_000 * 50));
4040
bitcoind
4141
}

‎bitcoind-tests/tests/test_cpp.rs

+22-28
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use bitcoin::psbt::Psbt;
1414
use bitcoin::{
1515
psbt, secp256k1, transaction, Amount, OutPoint, Sequence, Transaction, TxIn, TxOut, Txid,
1616
};
17-
use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};
17+
use bitcoind::{AddressType, Client};
1818
use miniscript::bitcoin::absolute;
1919
use miniscript::psbt::PsbtExt;
2020
use miniscript::{bitcoin, DefiniteDescriptorKey, Descriptor};
@@ -52,11 +52,13 @@ fn btc<F: Into<f64>>(btc: F) -> Amount { Amount::from_btc(btc.into()).unwrap() }
5252
// Ideally, we should find by scriptPubkey, but this
5353
// works for temp test case
5454
fn get_vout(cl: &Client, txid: Txid, value: Amount) -> (OutPoint, TxOut) {
55-
let tx = cl
56-
.get_transaction(&txid, None)
57-
.unwrap()
58-
.transaction()
59-
.unwrap();
55+
let model = cl
56+
.get_transaction(txid)
57+
.expect("rpc call failed")
58+
.into_model()
59+
.expect("conversion to model type failed");
60+
let tx = model.tx;
61+
6062
for (i, txout) in tx.output.into_iter().enumerate() {
6163
if txout.value == value {
6264
return (OutPoint::new(txid, i as u32), txout);
@@ -72,32 +74,25 @@ pub fn test_from_cpp_ms(cl: &Client, testdata: &TestData) {
7274
let pks = &testdata.pubdata.pks;
7375
// Generate some blocks
7476
let blocks = cl
75-
.generate_to_address(500, &cl.get_new_address(None, None).unwrap().assume_checked())
77+
.generate_to_address(500, &cl.new_address().unwrap())
7678
.unwrap();
77-
assert_eq!(blocks.len(), 500);
79+
assert_eq!(blocks.0.len(), 500);
7880

7981
// Next send some btc to each address corresponding to the miniscript
8082
let mut txids = vec![];
8183
for wsh in desc_vec.iter() {
8284
let txid = cl
83-
.send_to_address(
84-
&wsh.address(bitcoin::Network::Regtest).unwrap(),
85-
btc(1),
86-
None,
87-
None,
88-
None,
89-
None,
90-
None,
91-
None,
92-
)
93-
.unwrap();
85+
.send_to_address(&wsh.address(bitcoin::Network::Regtest).unwrap(), btc(1))
86+
.expect("rpc call failed")
87+
.txid()
88+
.expect("conversion to model failed");
9489
txids.push(txid);
9590
}
9691
// Wait for the funds to mature.
9792
let blocks = cl
98-
.generate_to_address(50, &cl.get_new_address(None, None).unwrap().assume_checked())
93+
.generate_to_address(50, &cl.new_address().unwrap())
9994
.unwrap();
100-
assert_eq!(blocks.len(), 50);
95+
assert_eq!(blocks.0.len(), 50);
10196
// Create a PSBT for each transaction.
10297
// Spend one input and spend one output for simplicity.
10398
let mut psbts = vec![];
@@ -130,10 +125,7 @@ pub fn test_from_cpp_ms(cl: &Client, testdata: &TestData) {
130125
// Get a new script pubkey from the node so that
131126
// the node wallet tracks the receiving transaction
132127
// and we can check it by gettransaction RPC.
133-
let addr = cl
134-
.get_new_address(None, Some(json::AddressType::Bech32))
135-
.unwrap()
136-
.assume_checked();
128+
let addr = cl.new_address_with_type(AddressType::Bech32).unwrap();
137129
psbt.unsigned_tx.output.push(TxOut {
138130
value: Amount::from_sat(99_999_000),
139131
script_pubkey: addr.script_pubkey(),
@@ -215,19 +207,21 @@ pub fn test_from_cpp_ms(cl: &Client, testdata: &TestData) {
215207
// Check whether the node accepts the transactions
216208
let txid = cl
217209
.send_raw_transaction(&tx)
218-
.unwrap_or_else(|_| panic!("{} send tx failed for ms {}", i, ms));
210+
.unwrap_or_else(|_| panic!("{} send tx failed for ms {}", i, ms))
211+
.txid()
212+
.expect("conversion to model failed");
219213
spend_txids.push(txid);
220214
}
221215
}
222216
// Finally mine the blocks and await confirmations
223217
let _blocks = cl
224-
.generate_to_address(10, &cl.get_new_address(None, None).unwrap().assume_checked())
218+
.generate_to_address(10, &cl.new_address().unwrap())
225219
.unwrap();
226220
// Get the required transactions from the node mined in the blocks.
227221
for txid in spend_txids {
228222
// Check whether the transaction is mined in blocks
229223
// Assert that the confirmations are > 0.
230-
let num_conf = cl.get_transaction(&txid, None).unwrap().info.confirmations;
224+
let num_conf = cl.get_transaction(txid).unwrap().confirmations;
231225
assert!(num_conf > 0);
232226
}
233227
}

‎bitcoind-tests/tests/test_desc.rs

+22-19
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use bitcoin::{
1717
absolute, psbt, secp256k1, sighash, transaction, Amount, OutPoint, Sequence, Transaction, TxIn,
1818
TxOut, Txid,
1919
};
20-
use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};
20+
use bitcoind::{AddressType, Client};
2121
use miniscript::bitcoin::{self, ecdsa, taproot, ScriptBuf};
2222
use miniscript::psbt::{PsbtExt, PsbtInputExt};
2323
use miniscript::{Descriptor, Miniscript, ScriptContext, ToPublicKey};
@@ -30,11 +30,13 @@ fn btc<F: Into<f64>>(btc: F) -> Amount { Amount::from_btc(btc.into()).unwrap() }
3030

3131
// Find the Outpoint by spk
3232
fn get_vout(cl: &Client, txid: Txid, value: Amount, spk: ScriptBuf) -> (OutPoint, TxOut) {
33-
let tx = cl
34-
.get_transaction(&txid, None)
35-
.unwrap()
36-
.transaction()
37-
.unwrap();
33+
let model = cl
34+
.get_transaction(txid)
35+
.expect("rpc call failed")
36+
.into_model()
37+
.expect("conversion to model type failed");
38+
let tx = model.tx;
39+
3840
for (i, txout) in tx.output.into_iter().enumerate() {
3941
if txout.value == value && spk == txout.script_pubkey {
4042
return (OutPoint::new(txid, i as u32), txout);
@@ -77,9 +79,9 @@ pub fn test_desc_satisfy(
7779
let x_only_pks = &testdata.pubdata.x_only_pks;
7880
// Generate some blocks
7981
let blocks = cl
80-
.generate_to_address(1, &cl.get_new_address(None, None).unwrap().assume_checked())
82+
.generate_to_address(1, &cl.new_address().unwrap())
8183
.unwrap();
82-
assert_eq!(blocks.len(), 1);
84+
assert_eq!(blocks.0.len(), 1);
8385

8486
let definite_desc = test_util::parse_test_desc(descriptor, &testdata.pubdata)
8587
.map_err(|_| DescError::DescParseError)?
@@ -92,13 +94,15 @@ pub fn test_desc_satisfy(
9294

9395
// Next send some btc to each address corresponding to the miniscript
9496
let txid = cl
95-
.send_to_address(&desc_address, btc(1), None, None, None, None, None, None)
96-
.unwrap();
97+
.send_to_address(&desc_address, btc(1))
98+
.expect("rpc call failed")
99+
.txid()
100+
.expect("conversion to model failed");
97101
// Wait for the funds to mature.
98102
let blocks = cl
99-
.generate_to_address(2, &cl.get_new_address(None, None).unwrap().assume_checked())
103+
.generate_to_address(2, &cl.new_address().unwrap())
100104
.unwrap();
101-
assert_eq!(blocks.len(), 2);
105+
assert_eq!(blocks.0.len(), 2);
102106
// Create a PSBT for each transaction.
103107
// Spend one input and spend one output for simplicity.
104108
let mut psbt = Psbt {
@@ -129,10 +133,7 @@ pub fn test_desc_satisfy(
129133
// Get a new script pubkey from the node so that
130134
// the node wallet tracks the receiving transaction
131135
// and we can check it by gettransaction RPC.
132-
let addr = cl
133-
.get_new_address(None, Some(json::AddressType::Bech32))
134-
.unwrap()
135-
.assume_checked();
136+
let addr = cl.new_address_with_type(AddressType::Bech32).unwrap();
136137
// Had to decrease 'value', so that fees can be increased
137138
// (Was getting insufficient fees error, for deep script trees)
138139
psbt.unsigned_tx
@@ -287,16 +288,18 @@ pub fn test_desc_satisfy(
287288
// Check whether the node accepts the transactions
288289
let txid = cl
289290
.send_raw_transaction(&tx)
290-
.unwrap_or_else(|_| panic!("send tx failed for desc {}", definite_desc));
291+
.unwrap_or_else(|_| panic!("send tx failed for desc {}", definite_desc))
292+
.txid()
293+
.expect("conversion to model failed");
291294

292295
// Finally mine the blocks and await confirmations
293296
let _blocks = cl
294-
.generate_to_address(1, &cl.get_new_address(None, None).unwrap().assume_checked())
297+
.generate_to_address(1, &cl.new_address().unwrap())
295298
.unwrap();
296299
// Get the required transactions from the node mined in the blocks.
297300
// Check whether the transaction is mined in blocks
298301
// Assert that the confirmations are > 0.
299-
let num_conf = cl.get_transaction(&txid, None).unwrap().info.confirmations;
302+
let num_conf = cl.get_transaction(txid).unwrap().confirmations;
300303
assert!(num_conf > 0);
301304
Ok(tx.input[0].witness.clone())
302305
}

0 commit comments

Comments
 (0)
Please sign in to comment.