code review fixes

stellar · Oct 5, 2023 · 48fc0e8 · 48fc0e8
1 parent 4a94d3b
commit 48fc0e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ingest/change.go b/ingest/change.go
@@ -72,7 +72,8 @@ func GetChangesFromLedgerEntryChanges(ledgerEntryChanges xdr.LedgerEntryChanges)
 		}
 	}
 
-	return sortChanges(changes)
+	sortChanges(changes)
+	return changes
 }
 
 type sortableChanges struct {
@@ -118,9 +119,8 @@ func (s sortableChanges) Swap(i, j int) {
 // multiple changes with the same ledger key in a LedgerEntryChanges group,
 // but if that is the case, we fall back to the original ordering of the changes
 // by using a stable sorting algorithm.
-func sortChanges(changes []Change) []Change {
+func sortChanges(changes []Change) {
 	sort.Stable(newSortableChanges(changes))
-	return changes
 }
 
 // LedgerEntryChangeType returns type in terms of LedgerEntryChangeType.

diff --git a/ingest/ledger_change_reader.go b/ingest/ledger_change_reader.go
@@ -139,7 +139,7 @@ func (r *LedgerChangeReader) Read() (Change, error) {
 				Post: nil,
 			}
 		}
-		changes = sortChanges(changes)
+		sortChanges(changes)
 		r.pending = append(r.pending, changes...)
 		r.state++
 		return r.Read()

diff --git a/services/horizon/CHANGELOG.md b/services/horizon/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this
 file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.27.0
+
+### Fixed
+- Ordering of effects are now deterministic. Previously the order of some Horizon effects could vary upon reingestion but this issue has now been fixed ([5070](https://github.com/stellar/go/pull/5070)).
 
 ## 2.27.0-rc2
 ### Fixed