Merge remote-tracking branch 'origin/hotstuff_integration' into GH-2125…

…-consider-vote
AntelopeIO · Mar 8, 2024 · e2b7c3c · e2b7c3c
2 parents 33fb779 + 3302a6b
commit e2b7c3c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libraries/chain/block_header_state_legacy.cpp b/libraries/chain/block_header_state_legacy.cpp
@@ -424,7 +424,7 @@ namespace eosio::chain {
 
       EOS_ASSERT(relevant_sig_count == keys.size(), wrong_signing_key,
                  "block signed by unexpected key: ${signing_keys}, expected: ${authority}. ${c} != ${s}",
-                 ("signing_keys", keys)("authority", valid_block_signing_authority));
+                 ("signing_keys", keys)("authority", valid_block_signing_authority)("c", relevant_sig_count)("s", keys.size()));
 
       EOS_ASSERT(is_satisfied, wrong_signing_key,
                  "block signatures do not satisfy the block signing authority",

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -1400,7 +1400,7 @@ struct controller_impl {
          if (startup != startup_t::existing_state)
            open_fork_db();
       } catch (const fc::exception& e) {
-         elog( "Update to open fork database, continueing without reversible blocks: ${e}", ("e", e));
+         elog( "Unable to open fork database, continuing without reversible blocks: ${e}", ("e", e));
       }
 
       if (startup == startup_t::genesis) {

diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py
@@ -196,7 +196,7 @@ def waitForNodeStarted(node):
         logFile = Utils.getNodeDataDir(catchupNodeNum) + "/stderr.txt"
         f = open(logFile)
         contents = f.read()
-        if contents.count("3030001 unlinkable_block_exception: Unlinkable block") > 10: # a few are fine
+        if contents.count("3030001 unlinkable_block_exception: Unlinkable block") > 15: # a few are fine
             errorExit(f"Node{catchupNodeNum} has unlinkable blocks: {logFile}.")
 
     testSuccessful=True