Implemented a blockStore call for query 2 layer parents

aionnetwork · Jan 30, 2020 · 846578f · 846578f
1 parent 92f40fd
commit 846578f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java b/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java
@@ -1387,7 +1387,11 @@ void redoIndexWithoutSideChains(Block block) {
     /**
      *  Retrieve three generation blocks with unity protocol info with one lock.
      * @param hash given hash of the block
+<<<<<<< Updated upstream
      * @return the 3 generation block data have matched hash with unity protocol info. Block[0] is the parent block,
+=======
+     * @return the 3 generation block data has matched hash with unity protocol info. Block[0] is the parent block,
+>>>>>>> Stashed changes
      * Block[1] is the grandParent block, and Block[2] is the greatParentBlock. The return might only contain the parent
      * block and still return the 3-elements array.
      */