Merge branch 'develop' into 25-reenable-tape

luniehq · Feb 13, 2018 · abc4a7e · abc4a7e
2 parents 2b19f5d + c2a8114
commit abc4a7e
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 46 deletions.
diff --git a/README.md b/README.md
@@ -59,11 +59,6 @@ To run the UI on a local node with `chain_id=local`:
 $ yarn run testnet local
 ```
 
-To run the UI with a mocked backend (without connecting to a testnet):
-```bash
-$ yarn run uionly
-```
-
 ---
 
 ### Production
@@ -130,7 +125,6 @@ A list of all environment variables and their purpose:
 |MOCK|'true', 'false'|'true' in development|Mock data to receive from the chain|
 |COSMOS_TEST|'true', 'false'|'false'|Disable code that influences unit tests, like logging to files|
 |COSMOS_NETWORK|{path to network configuration folder}|'../networks/gaia-1'|Network to connect to|
-|COSMOS_UI_ONLY|'true', 'false'|'false'|Ignore spinning up the tendermint binaries|
 |COSMOS_HOME|{path to config persistence folder}|'$HOME/cosmos-ui[-dev]'||
 |COSMOS_NODE|{ip of a certain node}||Node to connect to|
 |PLATFORM_TARGET|'all', 'win32', 'darwin', 'linux', 'mas'|'all'|Which platform to build for|

diff --git a/app/src/main/index.js b/app/src/main/index.js
@@ -34,7 +34,6 @@ const TEST = JSON.parse(process.env.COSMOS_TEST || 'false') !== false
 // TODO default logging or default disable logging?
 const LOGGING = JSON.parse(process.env.LOGGING || 'true') !== false
 const MOCK = JSON.parse(process.env.MOCK || !TEST && DEV) !== false
-const UI_ONLY = JSON.parse(process.env.COSMOS_UI_ONLY || 'false')
 const winURL = DEV
   ? `http://localhost:${config.wds_port}`
   : `file://${__dirname}/index.html`
@@ -117,9 +116,7 @@ function createWindow () {
     webPreferences: { webSecurity: false }
   })
 
-  if (UI_ONLY) {
-    mainWindow.loadURL(winURL + '?node=localhost')
-  } else if (!started) {
+  if (!started) {
     mainWindow.loadURL(winURL)
   } else {
     startVueApp()
@@ -370,10 +367,6 @@ async function reconnect (seeds) {
 }
 
 async function main () {
-  if (UI_ONLY) {
-    return
-  }
-
   let appVersionPath = join(root, 'app_version')
   let genesisPath = join(root, 'genesis.json')
   let configPath = join(root, 'config.toml')

diff --git a/app/src/renderer/node.js b/app/src/renderer/node.js
@@ -3,10 +3,6 @@ const RpcClient = require('tendermint')
 const RestClient = require('cosmos-sdk')
 
 module.exports = function (nodeIP, relayPort, lcdPort) {
-  if (JSON.parse(process.env.COSMOS_UI_ONLY || 'false')) {
-    return mockClient()
-  }
-
   const RELAY_SERVER = 'http://localhost:' + relayPort
 
   let node = new RestClient(RELAY_SERVER)
@@ -71,24 +67,6 @@ module.exports = function (nodeIP, relayPort, lcdPort) {
   return node
 }
 
-function mockClient () {
-  return {
-    rpc: {
-      on: () => {},
-      subscribe: () => {},
-      validators: () => {},
-      status: () => {}
-    },
-    generateKey: () => ({
-      key: {
-        address: 'UI_ONLY_MODE'
-      }
-    }),
-    queryAccount: () => {},
-    queryNonce: () => {}
-  }
-}
-
 function sleep (ms = 0) {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
diff --git a/package.json b/package.json
@@ -19,7 +19,6 @@
     "build:linux": "cross-env PLATFORM_TARGET=linux node tasks/release.js",
     "build:mas": "cross-env PLATFORM_TARGET=mas node tasks/release.js",
     "build:win32": "cross-env PLATFORM_TARGET=win32 node tasks/release.js",
-    "uionly": "cross-env COSMOS_UI_ONLY='true' yarn run testnet",
     "local": "npm run testnet local",
     "testnet": "node tasks/testnet.js",
     "lint": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter app test",

diff --git a/test/e2e/launch.js b/test/e2e/launch.js
@@ -7,7 +7,6 @@ let { join } = require('path')
 let { spawn } = require('child_process')
 let { newTempDir, login } = require('./common.js')
 
-// re-use app instance
 let app, home, cliHome, started
 let binary = process.env.BINARY_PATH 
 

diff --git a/test/unit/specs/node.spec.js b/test/unit/specs/node.spec.js
@@ -14,8 +14,6 @@ describe('LCD Connector', () => {
         destroy () {}
       }
     }))
-
-    process.env.COSMOS_UI_ONLY = 'false'
   })
 
   beforeAll(() => {
@@ -32,12 +30,6 @@ describe('LCD Connector', () => {
     expect(node.nodeIP).toBe('1.1.1.1')
   })
 
-  it('should return a mockClient if setting COSMOS_UI_ONLY', () => {
-    process.env.COSMOS_UI_ONLY = 'true'
-    let node = LCDConnector('1.1.1.1')
-    expect(node.generateKey().key.address).toBe('UI_ONLY_MODE')
-  })
-
   it('should init the rpc connection on initialization', () => {
     let node = LCDConnector('1.1.1.1')
     expect(node.rpc).toBeDefined()