Merge pull request #264 from thanhson1085/master

simplify tomomaster, blockSigner
BuildOnViction · Oct 30, 2018 · 331efab · 331efab
2 parents 819397b + 9b0c2bb
commit 331efab
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 644 deletions.
diff --git a/apis/blocksigners.js b/apis/blocksigners.js
diff --git a/apis/candidates.js b/apis/candidates.js
@@ -30,11 +30,6 @@ router.get('/', async function (req, res, next) {
         }
 
         let map = candidates.map(async c => {
-            let bs = await db.BlockSigner.findOne({
-                'signers.signer': c.candidate
-            }).sort({ _id: 'desc' })
-            c.latestSignedBlock = (bs || {}).blockNumber || 0
-
             // is masternode
             c.isMasternode = set.has(c.candidate)
             return c
@@ -55,9 +50,6 @@ router.get('/:candidate', async function (req, res, next) {
         candidate: address
     }) || {})
 
-    candidate.totalSignedBlocks = await db.BlockSigner.countDocuments({
-        'signers.signer': address
-    })
     return res.json(candidate)
 })
 

diff --git a/app/app.js b/app/app.js
@@ -7,7 +7,6 @@ import CandidateList from './components/candidates/List.vue'
 import CandidateApply from './components/candidates/Apply.vue'
 import CandidateResign from './components/candidates/Resign.vue'
 import CandidateWithdraw from './components/candidates/Withdraw.vue'
-import BlockSigner from './components/blocksigners/List.vue'
 import VoterView from './components/voters/View'
 import VotingView from './components/voters/Voting'
 import UnvotingView from './components/voters/Unvoting'
@@ -182,9 +181,6 @@ const router = new VueRouter({
         {
             path: '/confirm/:transaction', component: ConfirmView
         },
-        {
-            path: '/blocksigners', component: BlockSigner
-        },
         {
             path: '/setting', component: Setting
         }

diff --git a/app/components/blocksigners/List.vue b/app/components/blocksigners/List.vue
diff --git a/app/components/candidates/List.vue b/app/components/candidates/List.vue
@@ -78,7 +78,7 @@
 
                 <template
                     slot="cap"
-                    slot-scope="data">{{ formatCurrencySymbol(formatNumber(data.item.cap)) }}
+                    slot-scope="data">{{ formatCurrencySymbol(formatBigNumber(data.item.cap, 2)) }}
                 </template>
 
                 <template