fix: Tendermint error reporting in applyStateTransition

dashevo · Mar 10, 2020 · f8764e9 · f8764e9
1 parent 4c979a3
commit f8764e9
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 14 deletions.
diff --git a/lib/grpcServer/handlers/platform/applyStateTransitionHandlerFactory.js b/lib/grpcServer/handlers/platform/applyStateTransitionHandlerFactory.js
@@ -31,10 +31,13 @@ function applyStateTransitionHandlerFactory(rpcClient, handleAbciResponse) {
 
     const tx = Buffer.from(stByteArray).toString('base64');
 
-    const { result, error: errorMessage } = await rpcClient.request('broadcast_tx_commit', { tx });
+    const { result, error: jsonRpcError } = await rpcClient.request('broadcast_tx_commit', { tx });
 
-    if (errorMessage) {
-      throw new Error(errorMessage);
+    if (jsonRpcError) {
+      const error = new Error();
+      Object.assign(error, jsonRpcError);
+
+      throw error;
     }
 
     const { check_tx: checkTx, deliver_tx: deliverTx } = result;

diff --git a/lib/grpcServer/handlers/platform/getIdentityHandlerFactory.js b/lib/grpcServer/handlers/platform/getIdentityHandlerFactory.js
@@ -34,10 +34,13 @@ function getIdentityHandlerFactory(rpcClient, handleAbciResponse) {
 
     const data = Buffer.from(id).toString('hex');
 
-    const { result, error: errorMessage } = await rpcClient.request('abci_query', { path, data });
+    const { result, error: jsonRpcError } = await rpcClient.request('abci_query', { path, data });
 
-    if (errorMessage) {
-      throw new Error(errorMessage);
+    if (jsonRpcError) {
+      const error = new Error();
+      Object.assign(error, jsonRpcError);
+
+      throw error;
     }
 
     handleAbciResponse(result.response);

diff --git a/lib/rpcServer/commands/platform/applyStateTransitionHandlerFactory.js b/lib/rpcServer/commands/platform/applyStateTransitionHandlerFactory.js
@@ -15,10 +15,13 @@ function applyStateTransitionHandlerFactory(rpcClient, handleAbciResponse, valid
     validator.validate(args);
     const { stateTransition: tx } = args;
 
-    const { result, error: errorMessage } = await rpcClient.request('broadcast_tx_commit', { tx });
+    const { result, error: jsonRpcError } = await rpcClient.request('broadcast_tx_commit', { tx });
 
-    if (errorMessage) {
-      throw new Error(errorMessage);
+    if (jsonRpcError) {
+      const error = new Error();
+      Object.assign(error, jsonRpcError);
+
+      throw error;
     }
 
     const { check_tx: checkTx, deliver_tx: deliverTx } = result;

diff --git a/lib/rpcServer/commands/platform/getIdentityHandlerFactory.js b/lib/rpcServer/commands/platform/getIdentityHandlerFactory.js
@@ -18,10 +18,13 @@ function getIdentityHandlerFactory(rpcClient, handleAbciResponse, validator) {
 
     const data = Buffer.from(id).toString('hex');
 
-    const { result, error: errorMessage } = await rpcClient.request('abci_query', { path, data });
+    const { result, error: jsonRpcError } = await rpcClient.request('abci_query', { path, data });
 
-    if (errorMessage) {
-      throw new Error(errorMessage);
+    if (jsonRpcError) {
+      const error = new Error();
+      Object.assign(error, jsonRpcError);
+
+      throw error;
     }
 
     handleAbciResponse(result.response);

diff --git a/test/integration/rpcServer/commands/platform/applyStateTransitionHandlerFactory.spec.js b/test/integration/rpcServer/commands/platform/applyStateTransitionHandlerFactory.spec.js
@@ -34,7 +34,8 @@ describe('applyStateTransitionHandlerFactory', () => {
   });
 
   it('should throw an error if transaction broadcast returns error', async () => {
-    tendermintRpcMock.request.returns({ result: null, error: "Something didn't work" });
+    const error = { code: -1, message: "Something didn't work", data: 'Some data' };
+    tendermintRpcMock.request.returns({ result: null, error });
     const applyStateTransitionHandler = applyStateTransitionHandlerFactory(
       tendermintRpcMock, handleAbciMock, validator,
     );
@@ -44,7 +45,9 @@ describe('applyStateTransitionHandlerFactory', () => {
       await applyStateTransitionHandler({ stateTransition: st });
     } catch (e) {
       expect(e).to.be.an.instanceOf(Error);
-      expect(e.message).to.be.equal("Something didn't work");
+      expect(e.message).to.equal(error.message);
+      expect(e.data).to.equal(error.data);
+      expect(e.code).to.equal(error.code);
     }
   });
 });
diff --git a/test/unit/grpcServer/handlers/platform/applyStateTransitionHandlerFactory.js b/test/unit/grpcServer/handlers/platform/applyStateTransitionHandlerFactory.js
@@ -131,4 +131,19 @@ describe('applyStateTransitionHandlerFactory', () => {
       expect(e).to.equal(error);
     }
   });
+
+  it('should throw an error if transaction broadcast returns error', async () => {
+    const error = { code: -1, message: "Something didn't work", data: 'Some data' };
+
+    response.error = error;
+
+    try {
+      await applyStateTransitionHandler(call);
+    } catch (e) {
+      expect(e).to.be.an.instanceOf(Error);
+      expect(e.message).to.equal(error.message);
+      expect(e.data).to.equal(error.data);
+      expect(e.code).to.equal(error.code);
+    }
+  });
 });