Merge pull request #18 from imRohan/hotfix/redisScanCount

Removed Redis cursor validation, added count argument
imRohan · Apr 30, 2020 · ce04777 · ce04777
2 parents 4c355b5 + f6bdf1b
commit ce04777
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/models/account.ts b/src/models/account.ts
@@ -118,7 +118,7 @@ class Account {
 
   public async getBlocks(): Promise<string[]> {
     const _accountKey = Account.generateRedisKey(this.uuid)
-    const _blocks = await dataStore.scan(`${_accountKey}::block:*`)
+    const _blocks = await dataStore.scan(`${_accountKey}::block:*`, this.maxNumberOfBlocks)
 
     const _blocksSanitized = _blocks.map((block) => {
       return block.split(':')[4]

diff --git a/src/services/dataStore.ts b/src/services/dataStore.ts
@@ -79,17 +79,13 @@ const dataStore = {
     }
   },
 
-  async scan(pattern: string): Promise<string[]> {
+  async scan(pattern: string, count: number): Promise<string[]> {
     try {
       const _redisClient = redis.createClient()
       const _scan = promisify(_redisClient.scan).bind(_redisClient)
-      const [ _cursor, _storedKeys ] = await _scan(0, 'MATCH', pattern)
+      const [ , _storedKeys ] = await _scan(0, 'MATCH', pattern, 'COUNT', count)
       _redisClient.quit()
 
-      if (Number(_cursor) !== 0) {
-        throw new Error(`cursor returned invalid value: ${_cursor}`)
-      }
-
       return _storedKeys
     } catch (error) {
       logger.error(`Error when scanning keys: ${error.message}`)