Skip to content

Commit 2b7ba37

Browse files
committed
bitcoind: check all results in 'importdescriptors' result
1 parent 7cd856d commit 2b7ba37

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/bitcoind/interface.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,21 @@ impl BitcoinD {
401401
"importdescriptors",
402402
&params!(Json::Array(all_descriptors)),
403403
)?;
404-
if res.get(0).map(|x| x.get("success")) == Some(Some(&Json::Bool(true))) {
404+
let all_succeeded = res
405+
.as_array()
406+
.map(|results| {
407+
results
408+
.iter()
409+
.all(|res| res.get("success") == Some(&Json::Bool(true)))
410+
})
411+
.unwrap_or(false);
412+
if all_succeeded {
405413
return Ok(());
406414
}
407415

408416
Err(BitcoindError::Custom(format!(
409417
"Error returned from 'importdescriptor': {:?}",
410-
res.get(0).map(|r| r.get("error"))
418+
res
411419
)))
412420
}
413421

0 commit comments

Comments
 (0)