Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 10:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Transaction.SORT_TX_BY_HEIGHT: For transactions not 'building', use -1 height for sorting purposes.

Browse Source
This commit is contained in:
Andreas Schildbach 2017-06-25 20:18:37 +02:00
parent e3ca8f2d50
commit 0eabd240a6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/bitcoinj/core/Transaction.java
View File

@ -79,8 +79,12 @@ public class Transaction extends ChildMessage {
public static final Comparator<Transaction> SORT_TX_BY_HEIGHT = new Comparator<Transaction>() { public static final Comparator<Transaction> SORT_TX_BY_HEIGHT = new Comparator<Transaction>() {
@Override @Override
public int compare(final Transaction tx1, final Transaction tx2) { public int compare(final Transaction tx1, final Transaction tx2) {
final int height1 = tx1.getConfidence().getAppearedAtChainHeight(); final TransactionConfidence confidence1 = tx1.getConfidence();
final int height2 = tx2.getConfidence().getAppearedAtChainHeight(); final int height1 = confidence1.getConfidenceType() == ConfidenceType.BUILDING
? confidence1.getAppearedAtChainHeight() : -1;
final TransactionConfidence confidence2 = tx2.getConfidence();
final int height2 = confidence2.getConfidenceType() == ConfidenceType.BUILDING
? confidence2.getAppearedAtChainHeight() : -1;
final int heightComparison = -(Ints.compare(height1, height2)); final int heightComparison = -(Ints.compare(height1, height2));
//If height1==height2, compare by tx hash to make comparator consistent with equals //If height1==height2, compare by tx hash to make comparator consistent with equals
return heightComparison != 0 ? heightComparison : tx1.getHash().compareTo(tx2.getHash()); return heightComparison != 0 ? heightComparison : tx1.getHash().compareTo(tx2.getHash());