From ae6cf9fc32bad988c8f411025d2e63ce0607266f Mon Sep 17 00:00:00 2001
From: catbref <misc-github@talk2dom.com>
Date: Tue, 11 Jun 2019 14:24:38 +0100
Subject: [PATCH] Fix ordering when requesting summary of block forgers

---
 .../org/qora/repository/hsqldb/HSQLDBBlockRepository.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBBlockRepository.java b/src/main/java/org/qora/repository/hsqldb/HSQLDBBlockRepository.java
index 9fc80d61..69f9fbf9 100644
--- a/src/main/java/org/qora/repository/hsqldb/HSQLDBBlockRepository.java
+++ b/src/main/java/org/qora/repository/hsqldb/HSQLDBBlockRepository.java
@@ -180,9 +180,7 @@ public class HSQLDBBlockRepository implements BlockRepository {
 
 	@Override
 	public List<BlockForgerSummary> getBlockForgers(List<String> addresses, Integer limit, Integer offset, Boolean reverse) throws DataException {
-		String subquerySql = "SELECT generator, COUNT(signature) FROM Blocks GROUP BY generator ORDER BY COUNT(signature) ";
-		if (reverse != null && reverse)
-			subquerySql += " DESC";
+		String subquerySql = "SELECT generator, COUNT(signature) FROM Blocks GROUP BY generator";
 
 		String sql = "SELECT DISTINCT generator, n_blocks, forger, recipient FROM (" + subquerySql + ") AS Forgers (generator, n_blocks) "
 			+ " LEFT OUTER JOIN ProxyForgers ON proxy_public_key = generator ";
@@ -196,6 +194,10 @@ public class HSQLDBBlockRepository implements BlockRepository {
 			addresses = Collections.emptyList();
 		}
 
+		sql += "ORDER BY n_blocks ";
+		if (reverse != null && reverse)
+			sql += "DESC ";
+
 		sql += HSQLDBRepository.limitOffsetSql(limit, offset);
 
 		List<BlockForgerSummary> summaries = new ArrayList<>();