GH-2057 Simplify code

AntelopeIO · Mar 19, 2024 · 0a9f0c1 · 0a9f0c1
1 parent 52eb338
commit 0a9f0c1
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -1923,17 +1923,14 @@ struct controller_impl {
    block_state_pair get_block_state_to_snapshot() const
    {
        return apply<block_state_pair>(chain_head, overloaded{
-          [&](const block_state_legacy_ptr& head) {
+          [&](const block_state_legacy_ptr& head) -> block_state_pair {
              if (fork_db.version_in_use() == fork_database::in_use_t::both) {
-                block_state_legacy_ptr legacy_head = head;
-                block_state_ptr savanna_head;
-                fork_db.apply_s<void>([&](const auto& forkdb) {
-                   savanna_head = forkdb.head();
+                return fork_db.apply_s<block_state_pair>([&](const auto& forkdb) -> block_state_pair {
                    if (forkdb.root()->header.is_proper_svnn_block()) {
-                      legacy_head.reset(); // not needed if past transition
+                      return { {}, forkdb.head() }; // legacy not needed past transition
                    }
+                   return { head, forkdb.head() };
                 });
-                return block_state_pair{ legacy_head, savanna_head };
              }
              return block_state_pair{ head, {} };
           },