Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 13:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transaction.SORT_TX_BY_HEIGHT: Use the Block.BLOCK_HEIGHT_UNKNOWN constant rather than -1.

Browse Source
This commit is contained in:
Andreas Schildbach
2017-06-26 17:29:22 +02:00
parent 479ad2a49b
commit 7f34eefca4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,10 +80,10 @@ public class Transaction extends ChildMessage {
public int compare(final Transaction tx1, final Transaction tx2) { public int compare(final Transaction tx1, final Transaction tx2) {
final TransactionConfidence confidence1 = tx1.getConfidence(); final TransactionConfidence confidence1 = tx1.getConfidence();
final int height1 = confidence1.getConfidenceType() == ConfidenceType.BUILDING final int height1 = confidence1.getConfidenceType() == ConfidenceType.BUILDING
? confidence1.getAppearedAtChainHeight() : -1; ? confidence1.getAppearedAtChainHeight() : Block.BLOCK_HEIGHT_UNKNOWN;
final TransactionConfidence confidence2 = tx2.getConfidence(); final TransactionConfidence confidence2 = tx2.getConfidence();
final int height2 = confidence2.getConfidenceType() == ConfidenceType.BUILDING final int height2 = confidence2.getConfidenceType() == ConfidenceType.BUILDING
? confidence2.getAppearedAtChainHeight() : -1; ? confidence2.getAppearedAtChainHeight() : Block.BLOCK_HEIGHT_UNKNOWN;
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());