From 7972bf81d94ae82783babcbf16ce01e67bc66f0a Mon Sep 17 00:00:00 2001 From: 0g-peterzhb <158457852+0g-peterzhb@users.noreply.github.com> Date: Wed, 30 Apr 2025 20:26:04 +0800 Subject: [PATCH] update condition to align with source change (#368) --- common/append_merkle/src/proof.rs | 6 +++++- tests/test_framework/blockchain_node.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/append_merkle/src/proof.rs b/common/append_merkle/src/proof.rs index db7ad04..c1538c8 100644 --- a/common/append_merkle/src/proof.rs +++ b/common/append_merkle/src/proof.rs @@ -13,7 +13,11 @@ impl Proof { /// Creates new MT inclusion proof pub fn new(hash: Vec, path: Vec) -> Result> { if hash.len() != path.len() + 2 { - bail!("Proof::new: expected hash length = path.len() + 2, but got {} and {}", hash.len(), path.len()); + bail!( + "Proof::new: expected hash length = path.len() + 2, but got {} and {}", + hash.len(), + path.len() + ); } Ok(Proof { lemma: hash, path }) } diff --git a/tests/test_framework/blockchain_node.py b/tests/test_framework/blockchain_node.py index 1dc5e4e..78681b4 100644 --- a/tests/test_framework/blockchain_node.py +++ b/tests/test_framework/blockchain_node.py @@ -162,7 +162,7 @@ class TestNode: self.stderr.seek(0) stderr = self.stderr.read().decode("utf-8").strip() # TODO: Check how to avoid `pthread lock: Invalid argument`. - if stderr != expected_stderr and stderr != "pthread lock: Invalid argument": + if stderr != expected_stderr and stderr != "pthread lock: Invalid argument" and "pthread_mutex_lock" not in stderr: # print process status for debug if self.return_code is None: self.log.info("Process is still running")