Merge pull request #110 from Patrik-Stas/bugfix/zero-gte-seqno-cap

Fix error when setting seqnoGte filter to 0 causes returning empty array
Patrik-Stas · Jul 19, 2021 · 3ba5797 · 3ba5797
2 parents bc99d0f + 30e0417
commit 3ba5797
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 11 deletions.
diff --git a/indypool-client/package.json b/indypool-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-daemon",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Patrik Staš",
   "license": "ISC",
   "description": "Application scanning Hyperledger Indy blockchain for fetching and processing transactions.",

diff --git a/indyscan-api-client/package.json b/indyscan-api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-api-client",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Patrik Staš",
   "license": "ISC",
   "description": "IndyScan HTTP API client.",

diff --git a/indyscan-api-client/test/integration/index.spec.js b/indyscan-api-client/test/integration/index.spec.js
@@ -218,4 +218,12 @@ describe('basic api test suite', () => {
     expect(Array.isArray(txs)).toBeTruthy()
     expect(txs.length).toBe(2)
   })
+
+  it('should return transactions of low seqNo cap begins at 0', async () => {
+    const networks = await getNetworks(process.env.API_URL)
+    const networkId = process.env.NETWORK_ID || networks[0].id
+    const txs = await getTxsV2(process.env.API_URL, networkId, 'domain', 0, 2, [], 0, 5, 'full')
+    expect(Array.isArray(txs)).toBeTruthy()
+    expect(txs.length).toBe(2)
+  })
 })
diff --git a/indyscan-api/package.json b/indyscan-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-api",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Web application to browse Hyperledger Indy blockchain transactions.",
   "main": "index.js",
   "scripts": {

diff --git a/indyscan-api/src/service/service-txs.js b/indyscan-api/src/service/service-txs.js
@@ -13,7 +13,7 @@ function urlQueryTxNamesToEsQuery (urlQueryTxNames) {
 }
 
 function createSeqnoFilter (seqNoGte, seqNoLt) {
-  if (seqNoGte && seqNoLt) {
+  if ((!!seqNoGte || seqNoGte === 0) && (!!seqNoLt || seqNoLt === 0)) {
     return esFilterSeqNoGteLtRange(seqNoGte, seqNoLt)
   } else if (seqNoGte) {
     return esFilterSeqNoGte(seqNoGte)

diff --git a/indyscan-daemon-api-client/package.json b/indyscan-daemon-api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-daemon-api-client",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Patrik Staš",
   "license": "ISC",
   "description": "IndyScan Daemon HTTP API client.",

diff --git a/indyscan-daemon-ui/package.json b/indyscan-daemon-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-daemon-ui",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Patrik Staš",
   "license": "ISC",
   "description": "UI to view and manage the state of indyscan-daemon.",

diff --git a/indyscan-daemon/package.json b/indyscan-daemon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-daemon",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Patrik Staš",
   "license": "ISC",
   "description": "Application scanning Hyperledger Indy blockchain for fetching and processing transactions.",

diff --git a/indyscan-storage/package.json b/indyscan-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-storage",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Patrik Staš",
   "license": "ISC",
   "description": "",

diff --git a/indyscan-txtype/package.json b/indyscan-txtype/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-txtype",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/indyscan-webapp/package.json b/indyscan-webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indyscan-webapp",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Web application to browse Hyperledger Indy blockchain transactions.",
   "main": "index.js",
   "scripts": {

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
   "major": 4,
   "minor": 2,
-  "patch": 0
+  "patch": 1
 }