fix faulty null checks

MetaMask · Feb 12, 2020 · 764832d · 764832d
1 parent 702e342
commit 764832d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/errors.js b/src/errors.js
@@ -77,7 +77,7 @@ module.exports = {
      * @returns {EthereumRpcError} The error
      */
     server: (opts) => {
-      if (typeof opts !== 'object' || Array.isArray(opts)) {
+      if (!opts || typeof opts !== 'object' || Array.isArray(opts)) {
         throw new Error('Ethereum RPC Server errors must provide single object argument.')
       }
       const { code } = opts
@@ -203,7 +203,7 @@ module.exports = {
      * @returns {EthereumProviderError} The error
      */
     custom: (opts) => {
-      if (typeof opts !== 'object' || Array.isArray(opts)) {
+      if (!opts || typeof opts !== 'object' || Array.isArray(opts)) {
         throw new Error('Ethereum Provider custom errors must provide single object argument.')
       }
       const { code, message, data } = opts
@@ -240,7 +240,7 @@ function validateOpts (opts) {
   if (opts) {
     if (typeof opts === 'string') {
       message = opts
-    } else if (opts && typeof opts === 'object' && !Array.isArray(opts)) {
+    } else if (typeof opts === 'object' && !Array.isArray(opts)) {
       message = opts.message
       data = opts.data
     }

diff --git a/src/utils.js b/src/utils.js
@@ -83,7 +83,7 @@ function serializeError (error, fallbackError = FALLBACK_ERROR) {
     )
   }
 
-  if (typeof error === 'object' && error instanceof EthereumRpcError) {
+  if (error instanceof EthereumRpcError) {
     return error.serialize()
   }
-Original file line number
+Diff line change
@@ Expand Up @@
         )
       }
-      if (typeof error === 'object' && error instanceof EthereumRpcError) {
+      if (error instanceof EthereumRpcError) {
         return error.serialize()
       }
@@ Expand Down @@