all param replaced by zero limit (or null)

pshenmic · Sep 20, 2024 · 10d488a · 10d488a
1 parent 471c7f9
commit 10d488a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 293 deletions.
diff --git a/packages/api/README.md b/packages/api/README.md
@@ -219,8 +219,7 @@ GET /blocks
 Return all validators with pagination info.
 * `lastProposedBlockHeader` field is nullable
 * `?isActive=true` boolean can be supplied in the query params to filter by isActive field
-* `limit` cannot be more then 100
-* `all` boolean can be supplied in the query params to get all validators by params
+* `limit` cannot be more then 100 (0 = all validators)
 ```
 GET /validators
 

diff --git a/packages/api/src/controllers/ValidatorsController.js b/packages/api/src/controllers/ValidatorsController.js
@@ -36,7 +36,7 @@ class ValidatorsController {
   }
 
   getValidators = async (request, response) => {
-    const { page = 1, limit = 10, order = 'asc', isActive = undefined, all = false } = request.query
+    const { page = 1, limit = 0, order = 'asc', isActive = undefined } = request.query
 
     const activeValidators = await TenderdashRPC.getValidators()
 
@@ -45,8 +45,7 @@ class ValidatorsController {
       Number(limit),
       order,
       isActive,
-      activeValidators,
-      all
+      activeValidators
     )
 
     const validatorsWithInfo = await Promise.all(

diff --git a/packages/api/src/dao/ValidatorsDAO.js b/packages/api/src/dao/ValidatorsDAO.js
@@ -62,9 +62,9 @@ module.exports = class ValidatorsDAO {
     return Validator.fromRow(row)
   }
 
-  getValidators = async (page, limit, order, isActive, validators, all) => {
+  getValidators = async (page, limit, order, isActive, validators) => {
     const fromRank = ((page - 1) * limit) + 1
-    const toRank = all ? this.knex.raw("'+infinity'::numeric") : fromRank + limit - 1
+    const toRank = limit ? fromRank + limit - 1 : this.knex.raw("'+infinity'::numeric")
 
     const validatorsSubquery = this.knex('validators')
       .select(
@@ -137,7 +137,7 @@ module.exports = class ValidatorsDAO {
 
     const resultSet = rows.map((row) => Validator.fromRow(row))
 
-    return new PaginatedResultSet(resultSet, page, all ? resultSet.length : limit, totalCount)
+    return new PaginatedResultSet(resultSet, page, limit ?? resultSet.length, totalCount)
   }
 
   getValidatorStatsByProTxHash = async (proTxHash, timespan) => {

diff --git a/packages/api/src/schemas.js b/packages/api/src/schemas.js
@@ -18,10 +18,6 @@ const schemaTypes = [
         minimum: 1,
         maximum: 100
       },
-      all: {
-        type: ['boolean', 'null'],
-        default: false
-      },
       order: {
         type: ['string', 'null'],
         enum: ['asc', 'desc']