fix: unnecessary error data sent (#572)

Co-authored-by: Konstantin Shuplenkov <[email protected]>
dashevo · Sep 29, 2021 · 484ec39 · 484ec39
1 parent 10b9d1d
commit 484ec39
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/.github/workflows/.env b/.github/workflows/.env
@@ -1,4 +1,4 @@
-#DAPI_BRANCH=v0.21-dev
+DAPI_BRANCH=v0.21-dev
 DASHMATE_BRANCH=update-dpp
 # SDK_BRANCH=
 TEST_SUITE_BRANCH=update-dpp
diff --git a/lib/abci/errors/AbstractAbciError.js b/lib/abci/errors/AbstractAbciError.js
@@ -50,9 +50,14 @@ class AbstractAbciError extends DriveError {
   getAbciResponse() {
     const info = {
       message: this.getMessage(),
-      data: this.getData(),
     };
 
+    const data = this.getData();
+
+    if (Object.keys(data).length > 0) {
+      info.data = data;
+    }
+
     return {
       code: this.getCode(),
       info: cbor.encode(info).toString('base64'),

diff --git a/lib/abci/errors/DPPValidationAbciError.js b/lib/abci/errors/DPPValidationAbciError.js
@@ -9,9 +9,12 @@ class DPPValidationAbciError extends AbstractAbciError {
    * @param {AbstractConsensusError} consensusError
    */
   constructor(message, consensusError) {
-    const data = {
-      arguments: consensusError.getConstructorArguments(),
-    };
+    const args = consensusError.getConstructorArguments();
+
+    const data = { };
+    if (args.length > 0) {
+      data.arguments = args;
+    }
 
     super(consensusError.getCode(), message, data);
   }
@@ -20,13 +23,20 @@ class DPPValidationAbciError extends AbstractAbciError {
    * @returns {{code: number, info: string}}
    */
   getAbciResponse() {
-    const info = {
-      data: this.getData(),
-    };
+    const info = { };
+
+    const data = this.getData();
+
+    let encodedInfo;
+    if (Object.keys(data).length > 0) {
+      info.data = data;
+
+      encodedInfo = cbor.encode(info).toString('base64');
+    }
 
     return {
       code: this.getCode(),
-      info: cbor.encode(info).toString('base64'),
+      info: encodedInfo,
     };
   }
 }