@peter/align with source

common/append_merkle/src/proof.rs

@@ -13,7 +13,11 @@ impl<T: HashElement> Proof<T> {
     /// Creates new MT inclusion proof
     pub fn new(hash: Vec<T>, path: Vec<bool>) -> Result<Proof<T>> {
         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 })
     }

tests/test_framework/blockchain_node.py

@@ -162,7 +162,7 @@ def stop(self, expected_stderr="", kill=False, wait=True):
         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")