Skip to content

Commit 7fa9763

Browse files
tchardingtcharding
committed
Merge #469: add: support for v30.2 and integration test it
d37fb86 add: support and test for v30.2 (0xb10c) Pull request description: v30.0 and v30.1 currently aren't covered by the ingegration tests and their binaries aren't avalaible for download anymore due to a wallet migration bug. See #447 We can however use v30.2 in the integration tests. Also, make it avaliable as feature. ACKs for top commit: jamillambert: ACK d37fb86 tcharding: ACK d37fb86 Tree-SHA512: 9daf73db4c84b764ffd231aa0fa8654a324b70bc08c37f15f3562bfff7cb9e530e7391c41703f7f176b07a36456474cb0b79f0296e69d5247f3c496e85ca6bf2
2 parents e38f330 + d37fb86 commit 7fa9763

7 files changed

Lines changed: 45 additions & 6 deletions

File tree

‎.github/workflows/rust.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ jobs:
219219
matrix:
220220
version:
221221
[
222+
"30_2",
223+
# Don't integration test v30.0 and v30.1 as the binaries have been
224+
# removed due to a wallet migration bug.
222225
"29_0",
223226
"28_2",
224227
"28_1",

‎client/src/client_sync/v30/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub use crate::client_sync::{
2323
};
2424

2525
crate::define_jsonrpc_bitreq_client!("v30");
26-
crate::impl_client_check_expected_server_version!({ [300000] });
26+
crate::impl_client_check_expected_server_version!({ [300000, 300100, 300200] });
2727

2828
// == Blockchain ==
2929
crate::impl_client_v29__dump_tx_out_set!();

‎integration_test/Cargo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ edition = "2021"
1313
[features]
1414
download = ["node/download"]
1515

16-
latest = ["30_0"]
16+
latest = ["30_2"]
1717

1818
# Enable the same feature in `node` and the version feature here.
1919
# All minor releases of the latest four versions.
20+
30_2 = ["v30_and_below", "node/30_2"]
21+
# Skip v30.1 due to wallet migration bug.
2022
30_0 = ["v30_and_below", "node/30_0"]
2123
29_0 = ["v29_and_below", "node/29_0"]
2224
28_2 = ["v28_and_below", "node/28_2"]

‎node/Cargo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ default = ["0_17_2"]
4444

4545
download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "bitreq", "zip"]
4646

47-
latest = ["30_0"]
47+
latest = ["30_2"]
4848

4949
# We support all minor releases of the latest four versions.
50+
30_2 = ["30_0"]
51+
# Skip v30.1 due to wallet migration bug.
5052
30_0 = ["29_0"]
5153
29_0 = ["28_2"]
5254
28_2 = ["28_1"]

‎node/contrib/extra_tests.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
set -euox pipefail
1616

17-
FEATURES=("30_0 "29_0" "28_2" "28_1" "28_0" "27_1" "27_0" "26_2" "25_2" "24_2" \
18-
"23_2" "22_1" "0_21_2" "0_20_2" "0_19_1" "0_18_1" "0_17_2")
17+
FEATURES=("30_2" "30_0" "29_0" "28_2" "28_1" "28_0" "27_1" "27_0" "26_2" "25_2" \
18+
"24_2" "23_2" "22_1" "0_21_2" "0_20_2" "0_19_1" "0_18_1" "0_17_2")
1919

2020
# Use the current `Cargo.lock` file without updating it.
2121
cargo="cargo --locked"

‎node/sha256/bitcoin-core-30.2-SHA256SUMS‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2bd5db942a34bd68ba72627f03ff2e8633b4b73a1bd120d9c8a4b6632a71866a bitcoin-30.2-aarch64-linux-gnu-debug.tar.gz
2+
73e76c14edc79808a0511c744d102ffbb494807ee90cbcba176568243254b532 bitcoin-30.2-aarch64-linux-gnu.tar.gz
3+
6b821c2a26859ae62e565d1b11ce3786f9e561bac04e8a191a280be09efae3fa bitcoin-30.2-arm-linux-gnueabihf-debug.tar.gz
4+
d510542842318ea34d87cb2c93d6a7fe091dcac2e8684460be2b3c44843fb502 bitcoin-30.2-arm-linux-gnueabihf.tar.gz
5+
c2ecab62891de22228043815cb6211549a32272be3d5d052ff19847d3420bd10 bitcoin-30.2-arm64-apple-darwin.tar.gz
6+
4b8dbdb054f11a30bebbe796dd8f0bda4be2fd5b33b5d2d217c50577208b6a8a bitcoin-30.2-arm64-apple-darwin.zip
7+
18e85e068e9ff8a4b479d57b6f9ed214e5b51a1a948cfaec7708fdaa3b1d3ef5 bitcoin-30.2-arm64-apple-darwin-codesigning.tar.gz
8+
d9294b2423924d02b31abe3bd3d0535fd77f740fbf92a743bfbadb9f48817d32 bitcoin-30.2-arm64-apple-darwin-unsigned.tar.gz
9+
35aabaf80d31fdde1e59c7a1dca9af6f257cdd15a70ef73db0bd6a0acf29873f bitcoin-30.2-arm64-apple-darwin-unsigned.zip
10+
6d25892bf3699f3e9dc3e587411f557a3c40de0aab21f6239cb0a1caa1e6265b bitcoin-30.2-codesignatures-30.2.tar.gz
11+
6fd00b8c42883d5c963901ad4109a35be1e5ec5c2dc763018c166c21a06c84cb bitcoin-30.2.tar.gz
12+
cfb10f7bba0ae6d2b20fb274eb3882886f7d998da09ae291b534a599f690c59e bitcoin-30.2-powerpc64-linux-gnu-debug.tar.gz
13+
db8803f11f8259794864b8b0d2ef8a1a27d01a5943ff4f525bc26a325031fa87 bitcoin-30.2-powerpc64-linux-gnu.tar.gz
14+
4a64f2f850e9cdf2d51ae982f257c3d9ef0d447ab4bf0f5b7fa041cd5583e201 bitcoin-30.2-riscv64-linux-gnu-debug.tar.gz
15+
b0302e4d9579d19a9a501f1278e5d2c56d33fd9583040f34802d8567a1f81ace bitcoin-30.2-riscv64-linux-gnu.tar.gz
16+
99d5cee9b9c37be506396c30837a4b98e320bfea71c474d6120a7e8eb6075c7b bitcoin-30.2-x86_64-apple-darwin.tar.gz
17+
68f4fe0f64576833b50a54e2b4cd9d0538c8618f95d44017eeb4b0940be21118 bitcoin-30.2-x86_64-apple-darwin.zip
18+
d9e97e36fbbd84543a519bf0f9e4ad15d0cd2fee37035af701eea61a0aac25cc bitcoin-30.2-x86_64-apple-darwin-codesigning.tar.gz
19+
6f1445be3a91c5f284a42d99a397c3fd3c40112888c13b5edb366509dae7bb43 bitcoin-30.2-x86_64-apple-darwin-unsigned.tar.gz
20+
3a87a6aa45800314aa2e03c13b9eeb579ea941fa2319fceb75f65483c70c7b50 bitcoin-30.2-x86_64-apple-darwin-unsigned.zip
21+
f45ff30d0295379d56377d35ee67f426521e4caf2cd0af861e36f021a4be8aa0 bitcoin-30.2-x86_64-linux-gnu-debug.tar.gz
22+
6aa7bb4feb699c4c6262dd23e4004191f6df7f373b5d5978b5bcdd4bb72f75d8 bitcoin-30.2-x86_64-linux-gnu.tar.gz
23+
45916d6b896637d738d132c40430d486cdb0331b173be1eee439a49dba95e66a bitcoin-30.2-win64-setup.exe
24+
0d7e1f16f8823aa26d29b44855ff6dbac11c03d75631a6c1d2ea5fab3a84fdf8 bitcoin-30.2-win64.zip
25+
d419302d0fe4f9fb40ec0a4e47b3ff89de1ff37b8b3f49ceb466a66a1f853aa8 bitcoin-30.2-win64-codesigning.tar.gz
26+
62faa2cfe68776bb8bcf53eda2b6cc97084c392d326b7326aee3300163e51f09 bitcoin-30.2-win64-debug.zip
27+
ac173f866f14cb1d48dbeeea50fcb543e8868d0469ae7e6425b7bfa2b5f2c890 bitcoin-30.2-win64-setup-unsigned.exe
28+
17caed334788dfa67220675c6e45786ec2ef9cf1e06ecaf2d5e15678c0134cf2 bitcoin-30.2-win64-unsigned.zip

‎node/src/versions.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// An explicit version of Bitcoin Core must be selected by enabling some feature.
22
// We check this here instead of in `lib.rs` because this file is included in `build.rs`.
33
#[cfg(all(
4+
not(feature = "30_2"),
45
not(feature = "30_0"),
56
not(feature = "29_0"),
67
not(feature = "28_2"),
@@ -22,8 +23,11 @@
2223
))]
2324
compile_error!("enable a feature in order to select the version of Bitcoin Core to use");
2425

25-
#[cfg(feature = "30_0")]
26+
#[cfg(feature = "30_2")]
2627
#[allow(dead_code)] // Triggers in --all-features builds.
28+
pub const VERSION: &str = "30.2";
29+
30+
#[cfg(all(feature = "30_0", not(feature = "30_2")))]
2731
pub const VERSION: &str = "30.0";
2832

2933
#[cfg(all(feature = "29_0", not(feature = "30_0")))]

0 commit comments

Comments
 (0)