Merge pull request #24 from blocknative/feature/remove-ow-dependency

Remove `ow` dependency

Author: lnbc1QWFyb24

package.json

@@ -32,7 +32,6 @@
     "bnc-sdk": "0.1.1",
     "bowser": "^2.5.2",
     "fortmatic": "^0.8.2",
-    "ow": "^0.13.2",
     "promise-cancelable": "^2.1.1",
     "regenerator-runtime": "^0.13.3",
     "squarelink": "^1.1.3",

rollup.config.js

@@ -39,7 +39,6 @@ export default [
     external: [
       "bowser",
       "bnc-sdk",
-      "ow",
       "bignumber.js",
       "svelte-i18n",
       "svelte",

src/index.js

@@ -15,9 +15,9 @@ import {
   walletInterface
 } from "./stores"
 
-import { validateInit, validateConfig } from "./validation"
 import { isMobileDevice } from "./utilities"
 import { initializeBlocknative } from "./services"
+import { validateInit, validateConfig } from "./validation"
 
 import { version } from "../package.json"
 

src/modules/ready/index.js

@@ -2,19 +2,13 @@ import connect from "./connect"
 import network from "./network"
 import balance from "./balance"
 
+import { validateDefaultsOptions } from "../../validation"
+
 function defaults(options) {
-  if (!options || typeof options !== "object") {
-    throw new Error("initModules must be called with a valid option object")
-  }
+  validateDefaultsOptions(options)
 
   const { networkId, minimumBalance } = options
 
-  if (!networkId || typeof networkId !== "number") {
-    throw new Error(
-      "initModules must be called with a property of networkId that is of type Number"
-    )
-  }
-
   return [connect(), network(networkId), balance(minimumBalance || "0")]
 }
 

src/modules/select/wallets/fortmatic.js

@@ -1,27 +1,15 @@
 import Fortmatic from "fortmatic"
 import fortmaticIcon from "../wallet-icons/icon-fortmatic.svg"
 import { networkName } from "../../../utilities"
+import { validateType } from "../../../validation"
 
 function fortmatic(options) {
-  if (!options || typeof options !== "object") {
-    throw new Error(
-      "An options object is required to initialize fortmatic module"
-    )
-  }
+  validateType({ name: "Fortmatic options", value: options, type: "object" })
 
   const { apiKey, networkId } = options
 
-  if (!apiKey || typeof apiKey !== "string") {
-    throw new Error(
-      "A apiKey of type string is required to initialize fortmatic module"
-    )
-  }
-
-  if (!networkId || typeof networkId !== "number") {
-    throw new Error(
-      "A networkId of type number is required to initialize fortmatic module"
-    )
-  }
+  validateType({ name: "apiKey", value: apiKey, type: "string" })
+  validateType({ name: "networkId", value: networkId, type: "number" })
 
   return {
     name: "Fortmatic",

src/modules/select/wallets/portis.js

@@ -1,26 +1,16 @@
 import Portis from "@portis/web3"
 
 import { networkName } from "../../../utilities"
+import { validateType } from "../../../validation"
 import portisIcon from "../wallet-icons/icon-portis.svg"
 
 function portis(options) {
-  if (!options || typeof options !== "object") {
-    throw new Error("An options object is required to initialize portis module")
-  }
+  validateType({ name: "Portis options", value: options, type: "object" })
 
   const { apiKey, networkId } = options
 
-  if (!apiKey || typeof apiKey !== "string") {
-    throw new Error(
-      "A apiKey of type string is required to initialize portis module"
-    )
-  }
-
-  if (!networkId || typeof networkId !== "number") {
-    throw new Error(
-      "A network of type number is required to initialize portis module"
-    )
-  }
+  validateType({ name: "apiKey", value: apiKey, type: "string" })
+  validateType({ name: "networkId", value: networkId, type: "number" })
 
   return {
     name: "Portis",

src/stores.js

@@ -1,8 +1,8 @@
 import { writable, derived } from "svelte/store"
 import Cancelable from "promise-cancelable"
-import { validateWalletInterface } from "./validation"
 import { getBlocknative } from "./services"
 import { wait, makeQuerablePromise } from "./utilities"
+import { validateWalletInterface, validateType } from "./validation"
 
 export const app = writable({
   dappId: null,
@@ -88,9 +88,7 @@ function createUserStateStore(parameter) {
     subscribe,
     reset: () => set(null),
     setStateSyncer: stateSyncer => {
-      if (!stateSyncer || typeof stateSyncer !== "object") {
-        throw new Error("setStateSyncer must be called with a valid interface")
-      }
+      validateType({ name: "stateSyncer", value: stateSyncer, type: "object" })
 
       if (stateSyncer.onChange) {
         stateSyncer.onChange(set)
@@ -140,9 +138,7 @@ function createBalanceStore() {
   return {
     subscribe,
     setStateSyncer: syncer => {
-      if (!syncer || typeof syncer !== "object") {
-        throw new Error("setStateSyncer must be called with a valid interface")
-      }
+      validateType({ name: "syncer", value: syncer, type: "object" })
 
       stateSyncer = syncer
     }