Skip to content

Commit 7972bf8

Browse files
authored
update condition to align with source change (#368)
1 parent 17cb765 commit 7972bf8

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

common/append_merkle/src/proof.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ impl<T: HashElement> Proof<T> {
1313
/// Creates new MT inclusion proof
1414
pub fn new(hash: Vec<T>, path: Vec<bool>) -> Result<Proof<T>> {
1515
if hash.len() != path.len() + 2 {
16-
bail!("Proof::new: expected hash length = path.len() + 2, but got {} and {}", hash.len(), path.len());
16+
bail!(
17+
"Proof::new: expected hash length = path.len() + 2, but got {} and {}",
18+
hash.len(),
19+
path.len()
20+
);
1721
}
1822
Ok(Proof { lemma: hash, path })
1923
}

tests/test_framework/blockchain_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def stop(self, expected_stderr="", kill=False, wait=True):
162162
self.stderr.seek(0)
163163
stderr = self.stderr.read().decode("utf-8").strip()
164164
# TODO: Check how to avoid `pthread lock: Invalid argument`.
165-
if stderr != expected_stderr and stderr != "pthread lock: Invalid argument":
165+
if stderr != expected_stderr and stderr != "pthread lock: Invalid argument" and "pthread_mutex_lock" not in stderr:
166166
# print process status for debug
167167
if self.return_code is None:
168168
self.log.info("Process is still running")

0 commit comments

Comments
 (0)