change sorting so bitcoin-attested sequences go after their counterparts that are just pending.

This commit is contained in:
fiatjaf
2023-09-30 14:12:27 -03:00
parent cd3d6ee1a5
commit 212b1c85b1

View File

@@ -12,8 +12,8 @@ import (
func CompareInstructions(a, b Instruction) int { func CompareInstructions(a, b Instruction) int {
if a.Operation != nil { if a.Operation != nil {
if b.Attestation != nil { if b.Attestation != nil {
// a is an operation but b is an attestation, b is bigger // a is an operation but b is an attestation, a is bigger
return -1 return +1
} }
if a.Operation == b.Operation { if a.Operation == b.Operation {
// if both are the same operation sort by the argument // if both are the same operation sort by the argument
@@ -29,8 +29,8 @@ func CompareInstructions(a, b Instruction) int {
return 0 return 0
} }
} else if a.Attestation != nil && b.Attestation == nil { } else if a.Attestation != nil && b.Attestation == nil {
// a is an attestation but b is not, a is bigger // a is an attestation but b is not, b is bigger
return 1 return -1
} else if a.Attestation != nil && b.Attestation != nil { } else if a.Attestation != nil && b.Attestation != nil {
// both are attestations // both are attestations
if a.Attestation.BitcoinBlockHeight == 0 && b.Attestation.BitcoinBlockHeight == 0 { if a.Attestation.BitcoinBlockHeight == 0 && b.Attestation.BitcoinBlockHeight == 0 {