fedekunze/remove demo mode

CHANGELOG.md

@@ -90,6 +90,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [\#1277](https://github.com/cosmos/voyager/issues/1277) change name of VmToolBar to ToolBar, update all snapshots and import statements @coreycosman
 - [\#1432](https://github.com/cosmos/voyager/issues/1432) Moved @tendermint/UI components back into the Voyager repository @faboweb
 - Improved the readme @faboweb
+- [\#1792](https://github.com/cosmos/voyager/pull/1792) removed mocked demo mode @fedekunze
 
 ### Fixed
 

app/src/renderer/components/common/AppMenu.vue

@@ -13,7 +13,6 @@
         <i class="material-icons">chevron_right</i>
       </router-link>
       <router-link
-        v-if="config.devMode || mockedConnector"
         id="app-menu__transactions"
         class="app-menu-item"
         to="/transactions"
@@ -65,7 +64,7 @@ export default {
     ps: {}
   }),
   computed: {
-    ...mapGetters([`validators`, `config`, `lastHeader`, `mockedConnector`])
+    ...mapGetters([`validators`, `config`, `lastHeader`])
   },
   mounted() {
     this.ps = new PerfectScrollbar(this.$el.querySelector(`.app-menu-main`))

app/src/renderer/components/common/PagePreferences.vue

@@ -5,16 +5,6 @@
       <tool-bar />
     </template>
     <tm-part title="Settings">
-      <tm-list-item type="field" title="Select network to connect to">
-        <tm-field
-          id="select-network"
-          v-model="networkSelectActive"
-          :options="networkSelectOptions"
-          type="select"
-          placeholder="Select network..."
-          @change.native="setMockedConnector()"
-        />
-      </tm-list-item>
       <tm-list-item type="field" title="Node IP">
         <tm-btn :value="nodeURL" icon="exit_to_app" type="button" />
       </tm-list-item>
@@ -91,31 +81,12 @@ export default {
         value: `dark`,
         key: `Dark`
       }
-    ],
-    networkSelectActive: null,
-    networkSelectOptions: [
-      {
-        value: `live`,
-        key: `Live Testnet`
-      },
-      {
-        value: `mock`,
-        key: `Offline Mode`
-      }
     ]
   }),
   computed: {
-    ...mapGetters([
-      `user`,
-      `themes`,
-      `onboarding`,
-      `mockedConnector`,
-      `config`,
-      `nodeURL`
-    ])
+    ...mapGetters([`user`, `themes`, `onboarding`, `config`, `nodeURL`])
   },
   mounted() {
-    this.networkSelectActive = this.mockedConnector ? `mock` : `live`
     this.themeSelectActive = this.themes.active
   },
   methods: {
@@ -139,10 +110,6 @@ export default {
     setOnboarding({ $store } = this) {
       $store.commit(`setOnboardingState`, 0)
       $store.commit(`setOnboardingActive`, true)
-    },
-
-    setMockedConnector({ $store, networkSelectActive } = this) {
-      $store.dispatch(`setMockedConnector`, networkSelectActive === `mock`)
     }
   }
 }

app/src/renderer/components/common/TmConnectedNetwork.vue

@@ -1,10 +1,5 @@
 <template>
-  <div
-    v-if="connected"
-    id="tm-connected-network"
-    :class="cssClass"
-    class="tm-connected-network"
-  >
+  <div v-if="connected" id="tm-connected-network" class="tm-connected-network">
     <div class="tm-connected-network__connection">
       <div id="tm-connected-network__icon" class="tm-connected-network__icon">
         <i class="material-icons">lock</i>
@@ -14,17 +9,13 @@
         class="tm-connected-network__string"
       >
         <span v-tooltip.top="networkTooltip" class="chain-id">{{
-          chainId
+          lastHeader.chain_id
         }}</span>
       </div>
     </div>
     <div id="tm-connected-network__block" class="tm-connected-network__string">
-      <span v-tooltip.top="'Current block number'" v-if="mockedConnector">{{
-        blockHeight
-      }}</span
-      ><a
+      <a
         v-tooltip.top="'View block details on the Cosmos explorer.'"
-        v-if="!mockedConnector"
         :href="explorerLink"
         >{{ blockHeight }}<i class="material-icons exit">exit_to_app</i></a
       >
@@ -40,42 +31,29 @@
       v-tooltip.top="networkTooltip"
       class="tm-connected-network__string tm-connected-network__string--connecting"
     >
-      Connecting to {{ chainId }}…
+      Connecting to {{ lastHeader.chain_id }}…
     </div>
   </div>
 </template>
-
 <script>
 import { mapGetters } from "vuex"
 import num from "scripts/num"
-import { startCase, toLower } from "lodash"
 export default {
   name: `tm-connected-network`,
   data: () => ({
     num: num
   }),
   computed: {
-    ...mapGetters([`lastHeader`, `nodeURL`, `connected`, `mockedConnector`]),
-    cssClass() {
-      if (this.mockedConnector) {
-        return `tm-connected-network--mocked`
-      }
-    },
-    networkTooltip({ mockedConnector, connected, nodeURL, chainId } = this) {
-      if (mockedConnector) {
-        return `You\'re using the offline demo and are not connected to any real nodes.`
-      } else if (connected) {
-        return `You\'re connected to the ${chainId} testnet via node ${nodeURL}.`
-      } else if (!mockedConnector && !connected) {
-        return `We\'re pinging nodes to try to connect you to ${chainId}.`
-      }
-    },
-    chainId() {
-      if (this.mockedConnector) {
-        return startCase(toLower(this.lastHeader.chain_id))
-      } else {
-        return this.lastHeader.chain_id
+    ...mapGetters([`lastHeader`, `nodeURL`, `connected`]),
+    networkTooltip({ connected, nodeURL } = this) {
+      if (connected) {
+        return `You\'re connected to the ${
+          this.lastHeader.chain_id
+        } testnet via node ${nodeURL}.`
       }
+      return `We\'re pinging nodes to try to connect you to ${
+        this.lastHeader.chain_id
+      }.`
     },
     blockHeight() {
       return `#` + num.prettyInt(this.lastHeader.height)

app/src/renderer/components/common/TmModalNodeHalted.vue

@@ -19,13 +19,6 @@
           value="Switch Node"
           @click.native="switchNode"
         />
-        <tm-btn
-          id="tm-modal-error__btn-mock"
-          size="lg"
-          icon="pageview"
-          value="Try Demo"
-          @click.native="useMock"
-        />
       </div>
     </div>
   </div>
@@ -41,10 +34,6 @@ export default {
     switchNode() {
       ipcRenderer.send(`reconnect`)
       this.$store.commit(`setModalNodeHalted`, false)
-    },
-    useMock() {
-      this.$store.dispatch(`setMockedConnector`, true)
-      this.$store.commit(`setModalNodeHalted`, false)
     }
   }
 }

app/src/renderer/components/common/TmSessionSignIn.vue

@@ -45,9 +45,6 @@
             type="minLength"
             min="10"
           />
-          <tm-form-msg v-if="mockedConnector"
-            >default password is 1234567890</tm-form-msg
-          >
         </tm-form-group>
       </div>
       <div class="tm-session-footer">
@@ -94,7 +91,7 @@ export default {
     }
   }),
   computed: {
-    ...mapGetters([`user`, `mockedConnector`, `lastHeader`, `connected`]),
+    ...mapGetters([`user`, `lastHeader`, `connected`]),
     accounts() {
       let accounts = this.user.accounts
       accounts = accounts.filter(({ name }) => name !== `trunk`)
@@ -103,9 +100,6 @@ export default {
   },
   mounted() {
     this.setDefaultAccount(this.accounts)
-    if (this.mockedConnector) {
-      this.fields.signInPassword = `1234567890`
-    }
   },
   methods: {
     help() {

app/src/renderer/components/wallet/PageSend.vue

@@ -81,15 +81,6 @@
             type="between"
           />
         </tm-form-group>
-        <p v-if="mockedConnector">
-          <span>Try sending to the address "</span
-          ><strong style="font-weight: bold"
-            >cosmos1p6zajjw6xged056andyhn62lm7axwzyspkzjq0</strong
-          ><span
-            >", it's a friendly bot which will send the money back to you!</span
-          >
-        </p>
-        <br v-if="mockedConnector" />
         <hr />
       </tm-part>
       <tm-part>
@@ -205,13 +196,7 @@ export default {
     showPassword: false
   }),
   computed: {
-    ...mapGetters([
-      `wallet`,
-      `lastHeader`,
-      `config`,
-      `mockedConnector`,
-      `connected`
-    ]),
+    ...mapGetters([`wallet`, `lastHeader`, `config`, `connected`]),
     max() {
       let denom = this.wallet.balances.find(b => b.denom === this.denom)
       return (denom && denom.amount) || 0

app/src/renderer/vuex/getters.js

@@ -81,4 +81,3 @@ export const connected = state => state.connection.connected
 export const lastHeader = state => state.connection.lastHeader
 export const nodeURL = state =>
   state.connection.node ? state.connection.node.remoteLcdURL : undefined
-export const mockedConnector = state => state.connection.mocked

app/src/renderer/vuex/modules/connection.js

@@ -145,39 +145,6 @@ export default function({ node }) {
     disapproveNodeHash({ state }, hash) {
       state.approvalRequired = null
       ipcRenderer.send(`hash-disapproved`, hash)
-    },
-    async setMockedConnector({ state, dispatch, commit }, mocked) {
-      state.mocked = mocked
-
-      // Tell the main process our status in case of reload.
-      ipcRenderer.send(`mocked`, mocked)
-
-      // disable updates from the live node
-      node.rpcDisconnect()
-
-      // switch to a mocked or live node
-      node.setup(mocked)
-
-      // reconnect to the node
-      node.rpcReconnect()
-
-      if (mocked) {
-        // if we run a mocked version only, we don't want the lcd to run in the meantime
-        ipcRenderer.send(`stop-lcd`)
-
-        // we need to trigger this event for the mocked mode as it is usually triggered by the "connected" event from the main thread
-        dispatch(`rpcSubscribe`)
-
-        // the mocked node is automatically connected
-        dispatch(`reconnected`)
-      } else {
-        // if we switch to a live connector, we need to wait for the process to have started up again so we can access the KMS
-        commit(`setModalSession`, `loading`)
-        await new Promise(resolve => ipcRenderer.once(`connected`, resolve))
-      }
-
-      // sign user out, as when switching from mocked to live node, the account address needs to be clarified again
-      dispatch(`signOut`)
     }
   }
 

test/e2e/preferences.js

@@ -2,54 +2,23 @@
 
 let test = require(`tape-promise/tape`)
 let { getApp, restart } = require(`./launch.js`)
-let {
-  navigateToPreferences,
-  sleep,
-  login,
-  selectOption
-} = require(`./common.js`)
+let { navigateToPreferences, login } = require(`./common.js`)
 
 /*
  * NOTE: don't use a global `let client = app.client` as the client object changes when restarting the app
  */
 
 test(`preferences`, async function(t) {
   let { app } = await getApp(t)
-  await restart(app)
-
   let $ = (...args) => app.client.$(...args)
 
+  await restart(app)
   await login(app, `testkey`)
+  await navigateToPreferences(app)
 
-  t.test(`change`, async function(t) {
-    await navigateToPreferences(app)
-
-    let networkSelect = () => $(`#select-network select`)
-
-    t.test(`default network`, async function(t) {
-      let option = await networkSelect().getValue()
-      t.equal(option.toString(), `live`, `Live Testnet is correct`)
-      t.end()
-    })
-    t.test(`mock network`, async function(t) {
-      await selectOption(app, `#select-network select`, `Offline`)
-      await app.client.waitForVisible(`.tm-session-wrapper`, 5000)
-
-      await login(app, `default`)
-      await navigateToPreferences(app)
-
-      await sleep(1000)
-      let network = await app.client
-        .$(`#tm-connected-network__string`)
-        .getHTML()
-      t.ok(
-        network.indexOf(`Offline Demo`) !== -1,
-        `network indicator shows 'Offline Demo'`
-      )
-
-      t.end()
-    })
-
+  t.test(`shows preferences`, async function(t) {
+    t.ok(await $(`div*=Settings`).waitForExist(), `shows Settings`)
+    t.ok(await $(`div*=Account`).waitForExist(), `shows Account`)
     t.end()
   })