serialize errors using eth-json-rpc-errors; add .nvmrc (#14)

* serialize errors using eth-json-rpc-errors * add .nvmrc * remove dead code
MetaMask · Aug 9, 2019 · 5f86d20 · 5f86d20
1 parent f8186c7
commit 5f86d20
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 30 deletions.
diff --git a/merged-packages/json-rpc-engine/package-lock.json b/merged-packages/json-rpc-engine/package-lock.json
diff --git a/merged-packages/json-rpc-engine/package.json b/merged-packages/json-rpc-engine/package.json
@@ -22,6 +22,7 @@
     "@babel/preset-env": "^7.3.4",
     "async": "^2.0.1",
     "babelify": "^10.0.0",
+    "eth-json-rpc-errors": "^0.3.1",
     "promise-to-callback": "^1.0.0",
     "safe-event-emitter": "^1.0.1"
   },

diff --git a/merged-packages/json-rpc-engine/src/createAsyncMiddleware.js b/merged-packages/json-rpc-engine/src/createAsyncMiddleware.js
@@ -2,7 +2,6 @@ const promiseToCallback = require('promise-to-callback')
 
 module.exports = createAsyncMiddleware
 
-
 function createAsyncMiddleware(asyncMiddleware) {
   return (req, res, next, end) => {
     let nextDonePromise = null

diff --git a/merged-packages/json-rpc-engine/src/index.d.ts b/merged-packages/json-rpc-engine/src/index.d.ts
@@ -1,3 +1,6 @@
+
+import { IJsonRpcError } from 'eth-json-rpc-errors'
+
 /** A String specifying the version of the JSON-RPC protocol. MUST be exactly "2.0". */
 export type JsonRpcVersion = "2.0";
 
@@ -12,6 +15,8 @@ export type JsonRpcReservedMethod = string;
  *  NOT contain fractional parts [2] */
 export type JsonRpcId = number | string | void;
 
+interface JsonRpcError<T> extends IJsonRpcError<T> {}
+
 interface JsonRpcRequest<T> {
   jsonrpc: JsonRpcVersion;
   method: string;
@@ -39,13 +44,6 @@ interface JsonRpcFailure<T> extends JsonRpcResponse<T> {
     error: JsonRpcError<T>;
 }
 
-interface JsonRpcError<T> {
-  /** Must be an integer */
-  code: number;
-  message: string;
-  data?: T;
-}
-
 type JsonRpcEngineEndCallback = (error?: JsonRpcError<any>) => void;
 type JsonRpcEngineNextCallback = (returnFlightCallback?: (done: () => void) => void) => void;
 

diff --git a/merged-packages/json-rpc-engine/src/index.js b/merged-packages/json-rpc-engine/src/index.js
@@ -1,6 +1,7 @@
 'use strict'
 const async = require('async')
 const SafeEventEmitter = require('safe-event-emitter')
+const { serializeError } = require('eth-json-rpc-errors')
 
 class RpcEngine extends SafeEventEmitter {
   constructor () {
@@ -76,10 +77,6 @@ class RpcEngine extends SafeEventEmitter {
       // continue
       return cb(null, returnHandlers)
     }
-
-    function runReturnHandlers (returnHandlers, cb) {
-      async.eachSeries(returnHandlers, (handler, next) => handler(next), onDone)
-    }
   }
 
   // walks down stack of middleware
@@ -136,11 +133,4 @@ class RpcEngine extends SafeEventEmitter {
   }
 }
 
-function serializeError(err) {
-  return {
-    code: err.code || -32603,
-    message: err.stack,
-  }
-}
-
 module.exports = RpcEngine