add BIP69InputComparatorGeneric + BIP69OutputComparatorGeneric

Author: zeroleak

java/com/samourai/wallet/bip69/BIP69InputComparator.java

@@ -2,54 +2,14 @@
 
 import org.bitcoinj.core.TransactionInput;
 
-import java.util.Comparator;
-
-public class BIP69InputComparator implements Comparator<TransactionInput> {
-
-    public int compare(TransactionInput i1, TransactionInput i2) {
-        byte[] h1 = i1.getOutpoint().getHash().getBytes();
-        byte[] h2 = i2.getOutpoint().getHash().getBytes();
-
-        long index1 = i1.getOutpoint().getIndex();
-        long index2 = i2.getOutpoint().getIndex();
-
-        return compare(h1, h2, index1, index2);
+public class BIP69InputComparator extends BIP69InputComparatorGeneric<TransactionInput> {
+    @Override
+    protected byte[] getHash(TransactionInput i) {
+        return i.getOutpoint().getHash().getBytes();
     }
 
-    public int compare(byte[] h1, byte[] h2, long index1, long index2) {
-
-        final int BEFORE = -1;
-        final int EQUAL = 0;
-        final int AFTER = 1;
-
-        int pos = 0;
-        while(pos < h1.length && pos < h2.length)    {
-
-            byte b1 = h1[pos];
-            byte b2 = h2[pos];
-
-            if((b1 & 0xff) < (b2 & 0xff))    {
-                return BEFORE;
-            }
-            else if((b1 & 0xff) > (b2 & 0xff))    {
-                return AFTER;
-            }
-            else    {
-                pos++;
-            }
-
-        }
-
-        if(index1 < index2)    {
-            return BEFORE;
-        }
-        else if(index1 > index2)    {
-            return AFTER;
-        }
-        else    {
-            return EQUAL;
-        }
-
+    @Override
+    protected long getIndex(TransactionInput i) {
+        return i.getOutpoint().getIndex();
     }
-
 }

java/com/samourai/wallet/bip69/BIP69InputComparatorGeneric.java

@@ -0,0 +1,55 @@
+package com.samourai.wallet.bip69;
+
+import java.util.Comparator;
+
+public abstract class BIP69InputComparatorGeneric<T> implements Comparator<T> {
+    protected abstract byte[] getHash(T i);
+    protected abstract long getIndex(T i);
+
+    public int compare(T i1, T i2) {
+        byte[] h1 = getHash(i1);
+        byte[] h2 = getHash(i2);
+
+        long index1 = getIndex(i1);
+        long index2 = getIndex(i2);
+
+        return compare(h1, h2, index1, index2);
+    }
+
+    public int compare(byte[] h1, byte[] h2, long index1, long index2) {
+
+        final int BEFORE = -1;
+        final int EQUAL = 0;
+        final int AFTER = 1;
+
+        int pos = 0;
+        while(pos < h1.length && pos < h2.length)    {
+
+            byte b1 = h1[pos];
+            byte b2 = h2[pos];
+
+            if((b1 & 0xff) < (b2 & 0xff))    {
+                return BEFORE;
+            }
+            else if((b1 & 0xff) > (b2 & 0xff))    {
+                return AFTER;
+            }
+            else    {
+                pos++;
+            }
+
+        }
+
+        if(index1 < index2)    {
+            return BEFORE;
+        }
+        else if(index1 > index2)    {
+            return AFTER;
+        }
+        else    {
+            return EQUAL;
+        }
+
+    }
+
+}

java/com/samourai/wallet/bip69/BIP69OutputComparator.java

@@ -2,52 +2,14 @@
 
 import org.bitcoinj.core.TransactionOutput;
 
-import java.util.Comparator;
-
-public class BIP69OutputComparator implements Comparator<TransactionOutput> {
-
-    public int compare(TransactionOutput o1, TransactionOutput o2) {
-
-        final int BEFORE = -1;
-        final int EQUAL = 0;
-        final int AFTER = 1;
-
-        if(o1.getValue().compareTo(o2.getValue()) > 0) {
-            return AFTER;
-        }
-        else if(o1.getValue().compareTo(o2.getValue()) < 0) {
-            return BEFORE;
-        }
-        else    {
-
-            byte[] b1 = o1.getScriptBytes();
-            byte[] b2 = o2.getScriptBytes();
-
-            int pos = 0;
-            while(pos < b1.length && pos < b2.length)    {
-
-                if((b1[pos] & 0xff) < (b2[pos] & 0xff))    {
-                    return BEFORE;
-                }
-                else if((b1[pos] & 0xff) > (b2[pos] & 0xff))    {
-                    return AFTER;
-                }
-
-                pos++;
-            }
-
-            if(b1.length < b2.length)    {
-                return BEFORE;
-            }
-            else if(b1.length > b2.length)    {
-                return AFTER;
-            }
-            else    {
-                return EQUAL;
-            }
-
-        }
-
+public class BIP69OutputComparator extends BIP69OutputComparatorGeneric<TransactionOutput> {
+    @Override
+    protected long getValue(TransactionOutput i) {
+        return i.getValue().getValue();
     }
 
+    @Override
+    protected byte[] getScriptBytes(TransactionOutput i) {
+        return i.getScriptBytes();
+    }
 }

java/com/samourai/wallet/bip69/BIP69OutputComparatorGeneric.java

@@ -0,0 +1,58 @@
+package com.samourai.wallet.bip69;
+
+import com.google.common.primitives.Longs;
+
+import java.util.Comparator;
+
+public abstract class BIP69OutputComparatorGeneric<T> implements Comparator<T> {
+    protected abstract byte[] getScriptBytes(T i);
+    protected abstract long getValue(T i);
+
+    public int compare(T o1, T o2) {
+
+        final int BEFORE = -1;
+        final int EQUAL = 0;
+        final int AFTER = 1;
+
+        long o1Value = getValue(o1);
+        long o2Value = getValue(o2);
+
+        if(Longs.compare(o1Value, o2Value) > 0) {
+            return AFTER;
+        }
+        else if(Longs.compare(o1Value, o2Value) < 0) {
+            return BEFORE;
+        }
+        else    {
+
+            byte[] b1 = getScriptBytes(o1);
+            byte[] b2 = getScriptBytes(o2);
+
+            int pos = 0;
+            while(pos < b1.length && pos < b2.length)    {
+
+                if((b1[pos] & 0xff) < (b2[pos] & 0xff))    {
+                    return BEFORE;
+                }
+                else if((b1[pos] & 0xff) > (b2[pos] & 0xff))    {
+                    return AFTER;
+                }
+
+                pos++;
+            }
+
+            if(b1.length < b2.length)    {
+                return BEFORE;
+            }
+            else if(b1.length > b2.length)    {
+                return AFTER;
+            }
+            else    {
+                return EQUAL;
+            }
+
+        }
+
+    }
+
+}