Spelling fix for example server, better error handling

DigiByte-Core · Aug 4, 2020 · 75d148d · 75d148d
1 parent 1d4b6f8
commit 75d148d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/examples/serverSkeleton/services/ConstructionService.js b/examples/serverSkeleton/services/ConstructionService.js
@@ -30,7 +30,7 @@ const RosettaSDK = require('../../../..');
 * constructionMetadataRequest ConstructionMetadataRequest 
 * returns ConstructionMetadataResponse
 * */
-const constructioMetadata = (params) => {
+const constructionMetadata = async (params) => {
   const { constructionMetadataRequest } = params;
   return {};
 };
@@ -42,14 +42,14 @@ const constructioMetadata = (params) => {
 * constructionSubmitRequest ConstructionSubmitRequest 
 * returns ConstructionSubmitResponse
 * */
-const constructionSubmit = (params) => {
+const constructionSubmit = async (params) => {
   const { constructionSubmitRequest } = params;
   return {};
 };
 
 module.exports = {
   /* /construction/metadata */
-  constructioMetadata,
+  constructionMetadata,
 
   /* /construction/submit */
   constructionSubmit,

diff --git a/examples/serverSkeleton/services/MempoolService.js b/examples/serverSkeleton/services/MempoolService.js
@@ -30,7 +30,7 @@ const RosettaSDK = require('../../../..');
 * mempoolRequest MempoolRequest 
 * returns MempoolResponse
 * */
-const mempool = (params) => {
+const mempool = async (params) => {
   const { mempoolRequest } = params;
   return {};
 };
@@ -42,7 +42,7 @@ const mempool = (params) => {
 * mempoolTransactionRequest MempoolTransactionRequest 
 * returns MempoolTransactionResponse
 * */
-const mempoolTransaction = (params) => {
+const mempoolTransaction = async (params) => {
   const { mempoolTransactionRequest } = params;
   return {};
 };

diff --git a/lib/controllers/CallHandler.js b/lib/controllers/CallHandler.js
@@ -59,7 +59,7 @@ const CallHandler = async function (route, args) {
   // Try to call the asserter.
   await CallAsserter(asserter, modelName, requestParams);
 
-  return await data.handler(args);
+  return await data.handler(args.params);
 };
 
 module.exports = CallHandler;
diff --git a/lib/controllers/Controller.js b/lib/controllers/Controller.js
@@ -48,6 +48,8 @@ class Controller {
   }
 
   static sendError(response, error) {
+    console.error(error);
+
     const errResponse = {
       code: error.code,
       message: error.error || error.message,
@@ -214,13 +216,7 @@ class Controller {
       Controller.sendResponse(response, wrapped, app.config.BEAUTIFY_JSON);
 
     } catch (error) {
-      // Wrap the error message
-      const wrapped = Controller.rejectResponse(
-        error.message || 'Invalid input',
-        error.code || 405,
-      );
-
-      Controller.sendError(response, wrapped);
+      Controller.sendError(response, error);
     }
   }
 }