Peng/123 vuex tests

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

@@ -105,27 +105,25 @@ export default {
       await this.walletSend({
         fees: { denom, amount: 0 },
         to: address,
-        amount: [{ denom, amount }],
-        cb: (err) => {
-          this.sending = false
-          if (err) {
-            this.$store.commit('notifyError', {
-              title: 'Error Sending',
-              body: `An error occurred while trying to send: "${err.message}"`
-            })
-            return
-          }
-          this.$store.commit('notify', {
-            title: 'Successfully Sent',
-            body: `Successfully sent ${amount} ${denom.toUpperCase()} to ${address}`
-          })
+        amount: [{ denom, amount }]
+      }).then(() => {
+        this.sending = false
+        this.$store.commit('notify', {
+          title: 'Successfully Sent',
+          body: `Successfully sent ${amount} ${denom.toUpperCase()} to ${address}`
+        })
 
           // resets send transaction form
-          this.resetForm()
+        this.resetForm()
 
           // refreshes user transaction history
-          this.$store.dispatch('queryWalletHistory')
-        }
+        this.$store.dispatch('queryWalletHistory')
+      }, err => {
+        this.sending = false
+        this.$store.commit('notifyError', {
+          title: 'Error Sending',
+          body: `An error occurred while trying to send: "${err.message}"`
+        })
       })
     },
     ...mapActions(['walletSend'])

app/src/renderer/node.js

@@ -1,6 +1,7 @@
 'use strict'
 const RpcClient = require('tendermint')
 const RestClient = require('cosmos-sdk')
+const axios = require('axios')
 
 const RELAY_SERVER = 'http://localhost:8999'
 
@@ -61,6 +62,28 @@ module.exports = function (nodeIP) {
 
       node.rpcConnecting = false
       return nodeIP
+    },
+    async sendTx (args, account, password) {
+      let tx = await (async function () {
+        switch (args.type) {
+          case 'buildDelegate': return axios.post('http://localhost:8998/build/stake/delegate', args)
+            .then(res => res.data)
+          case 'buildUnbond': return axios.post('http://localhost:8998/build/stake/unbond', args)
+            .then(res => res.data)
+          default: return node[args.type](args)
+        }
+      })()
+      let signedTx = await node.sign({
+        name: account,
+        password: password,
+        tx
+      })
+      let res = await node.postTx(signedTx)
+      // check response code
+      if (res.check_tx.code || res.deliver_tx.code) {
+        let message = res.check_tx.log || res.deliver_tx.log
+        throw new Error('Error sending transaction: ' + message)
+      }
     }
   })
   // TODO: eventually, get all data from light-client connection instead of RPC

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

@@ -66,14 +66,14 @@ export default ({ commit }) => {
       await dispatch('walletTx', args)
     },
     async submitDelegation ({ state, dispatch }, delegation) {
-      for (let delegate of delegation.delegates) {
+      return Promise.all(delegation.delegates.map(delegate => {
         let candidateId = delegate.delegate.pub_key.data
         let currentlyDelegated = state.committedDelegates[candidateId] || 0
         let amountChange = delegate.atoms - currentlyDelegated
         let action = amountChange > 0 ? 'walletDelegate' : 'walletUnbond'
 
         // skip if no change
-        if (amountChange === 0) continue
+        if (amountChange === 0) return null
 
         // bonding takes a 'coin' object, unbond just takes a number
         let amount
@@ -84,17 +84,11 @@ export default ({ commit }) => {
           amount = Math.abs(amountChange)
         }
 
-        await new Promise((resolve, reject) => {
-          dispatch(action, {
-            amount,
-            pub_key: delegate.delegate.pub_key,
-            cb: (err, res) => {
-              if (err) return reject(err)
-              resolve(res)
-            }
-          })
+        return dispatch(action, {
+          amount,
+          pub_key: delegate.delegate.pub_key
         })
-      }
+      }).filter(x => x !== null))
     }
   }
 

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

@@ -8,6 +8,7 @@ export default function ({ node }) {
 
   const state = {
     nodeIP,
+    stopConnecting: false,
     connected: false,
     lastHeader: {
       height: 0,
@@ -16,6 +17,9 @@ export default function ({ node }) {
   }
 
   const mutations = {
+    stopConnecting (state, stop) {
+      state.stopConnecting = stop
+    },
     setConnected (state, connected) {
       state.connected = connected
     }
@@ -27,11 +31,15 @@ export default function ({ node }) {
       dispatch('maybeUpdateValidators', header)
     },
     async reconnect ({commit, dispatch}) {
+      if (state.stopConnecting) return
+
       commit('setConnected', false)
       await node.rpcReconnect()
       dispatch('nodeSubscribe')
     },
     nodeSubscribe ({commit, dispatch}) {
+      if (state.stopConnecting) return
+
       // the rpc socket can be closed before we can even attach a listener
       // so we remember if the connection is open
       // we handle the reconnection here so we can attach all these listeners on reconnect

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

@@ -1,14 +1,10 @@
 export default ({ commit, node }) => {
   const state = {
-    blockchainName: '',
     validators: {},
     validatorHash: null
   }
 
   const mutations = {
-    setValidatorBlockchainName (state, name) {
-      state.blockchainName = name
-    },
     setValidators (state, validators) {
       state.validators = validators
     },