Skip to content

Commit b2608a0

Browse files
committed
Use consistent name for finality mroot
1 parent 3a087e4 commit b2608a0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

libraries/chain/controller.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -4062,10 +4062,10 @@ struct controller_impl {
40624062

40634063
// compute finality mroot using previous block state and new qc claim
40644064
auto computed_finality_mroot = prev.get_finality_mroot_claim(new_qc_claim);
4065-
const auto& supplied_action_mroot = b->action_mroot;
4066-
EOS_ASSERT( computed_finality_mroot == supplied_action_mroot, block_validate_exception,
4067-
"computed finality mroot (${computed}) does not match supplied action mroot ${supplied} by header extension. Block number: ${b}, block id: ${id}",
4068-
("computed", computed_finality_mroot)("supplied", supplied_action_mroot)("b", block_num)("id", id) );
4065+
const auto& supplied_finality_mroot = b->action_mroot;
4066+
EOS_ASSERT( computed_finality_mroot == supplied_finality_mroot, block_validate_exception,
4067+
"computed finality mroot (${computed}) does not match supplied finality mroot ${supplied} by header extension. Block number: ${b}, block id: ${id}",
4068+
("computed", computed_finality_mroot)("supplied", supplied_finality_mroot)("b", block_num)("id", id) );
40694069
}
40704070

40714071
return std::optional{qc_proof};

unittests/block_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ BOOST_FIXTURE_TEST_CASE( invalid_action_mroot_test, tester )
441441
[] (const fc::exception &e)->bool {
442442
return e.code() == block_validate_exception::code_value &&
443443
e.to_detail_string().find("computed finality mroot") != std::string::npos &&
444-
e.to_detail_string().find("does not match supplied action mroot") != std::string::npos;
444+
e.to_detail_string().find("does not match supplied finality mroot") != std::string::npos;
445445
});
446446
}
447447

0 commit comments

Comments
 (0)