fix removeLeaf (#1842)

Signed-off-by: turuslan <turuslan.devbox@gmail.com>
qdrvm · Oct 11, 2023 · cad050d · cad050d
1 parent 0b5266b
commit cad050d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/core/blockchain/block_tree_error.hpp b/core/blockchain/block_tree_error.hpp
@@ -35,6 +35,7 @@ namespace kagome::blockchain {
     SOME_BLOCK_IN_CHAIN_NOT_FOUND,
     // block is not a leaf
     BLOCK_IS_NOT_LEAF,
+    BLOCK_IS_FINALIZED,
     BLOCK_NOT_EXISTS
   };
 }  // namespace kagome::blockchain

diff --git a/core/blockchain/impl/block_tree_error.cpp b/core/blockchain/impl/block_tree_error.cpp
@@ -34,6 +34,8 @@ OUTCOME_CPP_DEFINE_CATEGORY(kagome::blockchain, BlockTreeError, e) {
       return "the requested block body is not found in block storage";
     case E::BLOCK_IS_NOT_LEAF:
       return "the target block is not a leaf";
+    case E::BLOCK_IS_FINALIZED:
+      return "the target block is finalized";
     case E::BLOCK_NOT_EXISTS:
       return "target block doesn't exist";
   }

diff --git a/core/blockchain/impl/block_tree_impl.cpp b/core/blockchain/impl/block_tree_impl.cpp
@@ -596,8 +596,10 @@ namespace kagome::blockchain {
     return block_tree_data_.exclusiveAccess(
         [&](BlockTreeData &p) -> outcome::result<void> {
           // Check if block is leaf
-          if (block_hash == getLastFinalizedNoLock(p).hash
-              or p.tree_->isLeaf(block_hash)) {
+          if (block_hash == getLastFinalizedNoLock(p).hash) {
+            return BlockTreeError::BLOCK_IS_FINALIZED;
+          }
+          if (not p.tree_->isLeaf(block_hash)) {
             return BlockTreeError::BLOCK_IS_NOT_LEAF;
           }