fix: default validators store method returns all validators

solana-labs · Sep 9, 2019 · fda3c89 · fda3c89
1 parent 632d35d
commit fda3c89
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/src/v2/components/TourDeSol/Cards/index.jsx b/src/v2/components/TourDeSol/Cards/index.jsx
@@ -17,7 +17,7 @@ const Cards = ({
 }) => {
   const classes = useStyles();
   const {
-    validators,
+    activeValidators,
     inactiveValidators,
     supply,
     totalStaked,
@@ -77,7 +77,7 @@ const Cards = ({
     },
     {
       title: 'Active Validators',
-      value: validators.length,
+      value: activeValidators.length,
       changes: '',
       period: 'since yesterday',
       helpText:

diff --git a/src/v2/components/TourDeSol/Table/index.jsx b/src/v2/components/TourDeSol/Table/index.jsx
@@ -28,7 +28,7 @@ const ValidatorsTable = ({separate}: {separate: boolean}) => {
   const classes = useStyles();
   const theme = useTheme();
   const showTable = useMediaQuery(theme.breakpoints.up('md'));
-  const {validators} = NodesStore;
+  const {activeValidators} = NodesStore;
 
   const renderRow = row => {
     const uptime = getUptime(row);
@@ -82,7 +82,7 @@ const ValidatorsTable = ({separate}: {separate: boolean}) => {
             term=""
           />
         </Typography>
-        <Typography variant="h5">{validators.length}</Typography>
+        <Typography variant="h5">{activeValidators.length}</Typography>
         {!separate && (
           <Link to="/validators/all" className={classes.link}>
             See all &gt;
@@ -104,12 +104,12 @@ const ValidatorsTable = ({separate}: {separate: boolean}) => {
               root: classes.body,
             }}
           >
-            {map(renderRow)(validators)}
+            {map(renderRow)(activeValidators)}
           </TableBody>
         </Table>
       ) : (
         <div className={cn(classes.list, separate && classes.vertical)}>
-          {map(renderCard)(validators)}
+          {map(renderCard)(activeValidators)}
         </div>
       )}
     </div>

diff --git a/src/v2/components/Validators/All/index.jsx b/src/v2/components/Validators/All/index.jsx
@@ -8,13 +8,13 @@ import ValidatorsTable from '../Table';
 import useStyles from './styles';
 
 const ValidatorsAll = () => {
-  const {validators, inactiveValidators} = NodesStore;
+  const {activeValidators, inactiveValidators} = NodesStore;
   const classes = useStyles();
   return (
     <Container>
       <SectionHeader title="Validators">
         <div className={classes.total}>
-          {validators.length + inactiveValidators.length}
+          {activeValidators.length + inactiveValidators.length}
         </div>
       </SectionHeader>
       <ValidatorsTable separate />

diff --git a/src/v2/components/Validators/Table/index.jsx b/src/v2/components/Validators/Table/index.jsx
@@ -27,7 +27,7 @@ const ValidatorsTable = ({separate}: {separate: boolean}) => {
   const classes = useStyles();
   const theme = useTheme();
   const showTable = useMediaQuery(theme.breakpoints.up('md'));
-  const {validators, inactiveValidators} = NodesStore;
+  const {activeValidators, inactiveValidators} = NodesStore;
   const renderRow = row => {
     const uptime = row.uptime && getUptime(row);
     const {identity = {}, nodePubkey, activatedStake, commission} = row;
@@ -88,7 +88,7 @@ const ValidatorsTable = ({separate}: {separate: boolean}) => {
         <div className={classes.header}>
           <Typography>Validators</Typography>
           <Typography variant="h5">
-            {validators.length + inactiveValidators.length}
+            {activeValidators.length + inactiveValidators.length}
           </Typography>
 
           <Link to="/validators/all" className={classes.link}>
@@ -111,13 +111,13 @@ const ValidatorsTable = ({separate}: {separate: boolean}) => {
               root: classes.body,
             }}
           >
-            {map(renderRow)(validators)}
+            {map(renderRow)(activeValidators)}
             {map(renderRow)(inactiveValidators)}
           </TableBody>
         </Table>
       ) : (
         <div className={cn(classes.list, separate && classes.vertical)}>
-          {map(renderCard)(validators)}
+          {map(renderCard)(activeValidators)}
           {map(renderCard)(inactiveValidators)}
         </div>
       )}

diff --git a/src/v2/stores/nodes.js b/src/v2/stores/nodes.js
@@ -54,6 +54,10 @@ class Store {
   }
 
   get validators() {
+    return filter(node => node.what === 'Validator')(this.network);
+  }
+
+  get activeValidators() {
     return filter(node => node.what === 'Validator' && node.activatedStake)(
       this.network,
     );
@@ -73,6 +77,7 @@ decorate(Store, {
   updateClusterInfo: action.bound,
   mapMarkers: computed,
   validators: computed,
+  activeValidators: computed,
   inactiveValidators: computed,
   fetchClusterInfo: action.bound,
 });