Refactor/substrate context

README.md

@@ -93,21 +93,21 @@ keyring and the blockchain itself. Specifically it exposes this API.
   state: {
     socket,
     keyring,
-    keyringState,
+    keyringStatus,
     api,
-    apiState,
+    apiStatus,
     currentAccount
   }
 }
 ```
 
 - `socket` - The remote provider socket it is connecting to.
 - `keyring` - A keyring of accounts available to the user.
-- `keyringState` - One of `"READY"` or `"ERROR"` states. `keyring` is valid
-  only when `keyringState === "READY"`.
+- `keyringStatus` - One of `"READY"` or `"ERROR"` states. `keyring` is valid
+  only when `keyringStatus === "READY"`.
 - `api` - The remote api to the connected node.
-- `apiState` - One of `"CONNECTING"`, `"READY"`, or `"ERROR"` states. `api` is valid
-  only when `apiState === "READY"`.
+- `apiStatus` - One of `"CONNECTING"`, `"READY"`, or `"ERROR"` states. `api` is valid
+  only when `apiStatus === "READY"`.
 - `currentAccount` - The current selected account pair in the application context.
 - `setCurrentAccount` - Function to update the `currentAccount` value in the application context.
 

src/App.js

@@ -9,7 +9,12 @@ import {
 } from 'semantic-ui-react'
 import 'semantic-ui-css/semantic.min.css'
 
-import { SubstrateContextProvider, useSubstrateState } from './substrate-lib'
+import { SubstrateProvider, useSubstrateState } from './substrate-lib'
+import {
+  ApiStatus,
+  KeyringStatus,
+  ActionType,
+} from './substrate-lib/substrate-context'
 import { DeveloperConsole } from './substrate-lib/components'
 
 import AccountSelector from './AccountSelector'
@@ -24,14 +29,14 @@ import Transfer from './Transfer'
 import Upgrade from './Upgrade'
 
 function Main() {
-  const { apiState, apiError, keyringState } = useSubstrateState()
+  const { apiStatus, apiError, keyringStatus, keyring, api } =
+    useSubstrateState()
 
   const loader = text => (
     <Dimmer active>
       <Loader size="small">{text}</Loader>
     </Dimmer>
   )
-
   const message = errObj => (
     <Grid centered columns={2} padded>
       <Grid.Column>
@@ -46,13 +51,35 @@ function Main() {
     </Grid>
   )
 
-  if (apiState === 'ERROR') return message(apiError)
-  else if (apiState !== 'READY') return loader('Connecting to Substrate')
+  switch (apiStatus) {
+    case ApiStatus.Idle:
+    case ApiStatus.ConnectInit:
+    case ApiStatus.Connecting:
+      return loader('Connecting to Substrate')
+    case ApiStatus.Ready:
+      break
+    case ApiStatus.Error:
+      return message(apiError)
+    default:
+      throw new Error('Invalid ApiStatus!')
+  }
+
+  switch (keyringStatus) {
+    case KeyringStatus.Idle:
+    case KeyringStatus.Loading:
+      return loader(
+        "Loading accounts (please review any extension's authorization)"
+      )
+    case KeyringStatus.Ready:
+      break
+    case KeyringStatus.Error:
+      throw new Error(`${ActionType.SetKeyringError}!`)
+    default:
+      throw new Error('Invalid KeyringStatus!')
+  }
 
-  if (keyringState !== 'READY') {
-    return loader(
-      "Loading accounts (please review any extension's authorization)"
-    )
+  if (keyring === null || api === null) {
+    throw new Error('Something went wrong!')
   }
 
   const contextRef = createRef()
@@ -93,8 +120,8 @@ function Main() {
 
 export default function App() {
   return (
-    <SubstrateContextProvider>
+    <SubstrateProvider>
       <Main />
-    </SubstrateContextProvider>
+    </SubstrateProvider>
   )
 }

src/substrate-lib/components/DeveloperConsole.js

@@ -2,11 +2,11 @@
 import { useSubstrateState } from '../'
 
 export default function DeveloperConsole(props) {
-  const { api, apiState, keyring, keyringState } = useSubstrateState()
-  if (apiState === 'READY') {
+  const { api, apiStatus, keyring, keyringStatus } = useSubstrateState()
+  if (apiStatus === 'READY') {
     window.api = api
   }
-  if (keyringState === 'READY') {
+  if (keyringStatus === 'READY') {
     window.keyring = keyring
   }
   window.util = require('@polkadot/util')

src/substrate-lib/index.js

@@ -1,8 +1,8 @@
 import {
-  SubstrateContextProvider,
+  SubstrateProvider,
   useSubstrate,
   useSubstrateState,
-} from './SubstrateContext'
+} from './substrate-context'
 import utils from './utils'
 
-export { SubstrateContextProvider, useSubstrate, useSubstrateState, utils }
+export { SubstrateProvider, useSubstrate, useSubstrateState, utils }