From be617df21f80ce3686987bfbc4fe0e30fe4b31a3 Mon Sep 17 00:00:00 2001
From: kwingram25 <kwingram25@gmail.com>
Date: Thu, 9 May 2019 17:20:30 +0200
Subject: [PATCH] Fix error causing balances.all = undefined (#891)

* Updated with derive.balances.all

* add new keys to votingBalance

* remove multi test

* vestedBalance > 0

* bestNumber bug

* Check balances.all > 0

* Check balances.all > 0

* Check balances.all > 0
---
 packages/api-derive/src/balances/all.ts       | 2 +-
 packages/api/test/e2e/promise-queries.spec.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/api-derive/src/balances/all.ts b/packages/api-derive/src/balances/all.ts
index 7f91a34cbf..26af330080 100644
--- a/packages/api-derive/src/balances/all.ts
+++ b/packages/api-derive/src/balances/all.ts
@@ -21,7 +21,7 @@ export function all (api: ApiInterface$Rx) {
         (accountId
           ? combineLatest([
             of(accountId),
-            api.query.chain.bestNumber(),
+            api.derive.chain.bestNumber(),
             api.query.balances.freeBalance(accountId),
             api.query.balances.reservedBalance(accountId),
             api.query.balances.locks(accountId),
diff --git a/packages/api/test/e2e/promise-queries.spec.js b/packages/api/test/e2e/promise-queries.spec.js
index 02659d7256..06e95bc7cd 100644
--- a/packages/api/test/e2e/promise-queries.spec.js
+++ b/packages/api/test/e2e/promise-queries.spec.js
@@ -8,6 +8,8 @@ import { LinkageResult } from '@plugnet/types/codec/Linkage';
 
 import Api from '../../src/promise';
 
+const ZERO = new BN(0);
+
 describe.skip('e2e queries', () => {
   const keyring = testingPairs({ type: 'ed25519' });
   let api;
@@ -107,9 +109,14 @@ describe.skip('e2e queries', () => {
       keyring.alice.address(),
       (all) => {
         expect(all.accountId).toEqual(keyring.alice.address());
+
         expect(all.freeBalance).toBeDefined();
-        expect(all.reservedBalance).toBeDefined();
+        expect(all.freeBalance.gt(ZERO)).toBe(true);
+
         expect(all.availableBalance).toBeDefined();
+        expect(all.availableBalance.gt(ZERO)).toBe(true);
+
+        expect(all.reservedBalance).toBeDefined();
         expect(all.lockedBalance).toBeDefined();
         expect(all.vestedBalance).toBeDefined();