Skip to content

Commit 77f47ec

Browse files
committed
Make checksum optional in GetDescriptorInfoResult.
- Checksum field is added only since v0.19.0
1 parent 687e615 commit 77f47ec

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

integration_test/src/main.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,11 +1330,17 @@ fn test_wait_for_block(cl: &Client) {
13301330
fn test_get_descriptor_info(cl: &Client) {
13311331
let res = cl.get_descriptor_info(r"pkh(cSQPHDBwXGjVzWRqAHm6zfvQhaTuj1f2bFH58h55ghbjtFwvmeXR)").unwrap();
13321332
assert_eq!(res.descriptor, r"pkh(02e96fe52ef0e22d2f131dd425ce1893073a3c6ad20e8cac36726393dfb4856a4c)#62k9sn4x");
1333-
assert_eq!(res.checksum, "37v3lm8x");
13341333
assert_eq!(res.is_range, false);
13351334
assert_eq!(res.is_solvable, true);
13361335
assert_eq!(res.has_private_keys, true);
13371336

1337+
// Checksum introduced in: https://github.com/bitcoin/bitcoin/commit/26d3fad1093dfc697048313be7a96c9adf723654
1338+
if version() >= 190000 {
1339+
assert_eq!(res.checksum, Some("37v3lm8x".to_string()));
1340+
} else {
1341+
assert!(res.checksum.is_none());
1342+
}
1343+
13381344
assert!(cl.get_descriptor_info("abcdef").is_err());
13391345
}
13401346

json/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ pub struct BlockRef {
14981498
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
14991499
pub struct GetDescriptorInfoResult {
15001500
pub descriptor: String,
1501-
pub checksum: String,
1501+
pub checksum: Option<String>,
15021502
#[serde(rename = "isrange")]
15031503
pub is_range: bool,
15041504
#[serde(rename = "issolvable")]

0 commit comments

Comments
 (0)