|
4 | 4 | import java.lang.ref.WeakReference; |
5 | 5 | import java.util.ArrayList; |
6 | 6 | import java.util.Comparator; |
7 | | -import java.util.HashMap; |
8 | 7 | import java.util.LinkedHashMap; |
9 | 8 | import java.util.LinkedList; |
10 | 9 | import java.util.List; |
@@ -205,37 +204,6 @@ private void checkNull(Object o) throws NonCommonBlockException { |
205 | 204 | } |
206 | 205 | } |
207 | 206 |
|
208 | | - /** |
209 | | - * Find two block's most recent common parent block. |
210 | | - */ |
211 | | - @Deprecated |
212 | | - public Pair<LinkedList<BlockCapsule>, LinkedList<BlockCapsule>> getBranch( |
213 | | - BlockId block1, BlockId block2) { |
214 | | - LinkedList<BlockCapsule> list1 = new LinkedList<>(); |
215 | | - LinkedList<BlockCapsule> list2 = new LinkedList<>(); |
216 | | - KhaosBlock kblk1 = miniStore.getByHash(block1); |
217 | | - KhaosBlock kblk2 = miniStore.getByHash(block2); |
218 | | - |
219 | | - if (kblk1 != null && kblk2 != null) { |
220 | | - while (!Objects.equals(kblk1, kblk2)) { |
221 | | - if (kblk1.num > kblk2.num) { |
222 | | - list1.add(kblk1.blk); |
223 | | - kblk1 = kblk1.getParent(); |
224 | | - } else if (kblk1.num < kblk2.num) { |
225 | | - list2.add(kblk2.blk); |
226 | | - kblk2 = kblk2.getParent(); |
227 | | - } else { |
228 | | - list1.add(kblk1.blk); |
229 | | - list2.add(kblk2.blk); |
230 | | - kblk1 = kblk1.getParent(); |
231 | | - kblk2 = kblk2.getParent(); |
232 | | - } |
233 | | - } |
234 | | - } |
235 | | - |
236 | | - return new Pair<>(list1, list2); |
237 | | - } |
238 | | - |
239 | 207 | // only for unit test |
240 | 208 | public BlockCapsule getParentBlock(Sha256Hash hash) { |
241 | 209 | return Stream.of(miniStore.getByHash(hash), miniUnlinkedStore.getByHash(hash)) |
|
0 commit comments