fix: Use http BadRequest (400) when balance-info not found (#355)

paritytech · Dec 9, 2020 · c2a4937 · c2a4937
1 parent 692193d
commit c2a4937
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/services/accounts/AccountsBalanceInfoService.ts b/src/services/accounts/AccountsBalanceInfoService.ts
@@ -1,4 +1,5 @@
 import { BlockHash } from '@polkadot/types/interfaces';
+import { BadRequest } from 'http-errors';
 import { IAccountBalanceInfo } from 'src/types/responses';
 
 import { AbstractService } from '../AbstractService';
@@ -29,7 +30,7 @@ export class AccountsBalanceInfoService extends AbstractService {
 
 		const at = {
 			hash,
-			height: header.number.toNumber().toString(10),
+			height: header.number.unwrap().toString(10),
 		};
 
 		if (account && locks && sysAccount) {
@@ -46,10 +47,7 @@ export class AccountsBalanceInfoService extends AbstractService {
 				locks,
 			};
 		} else {
-			throw {
-				at,
-				error: 'Account not found',
-			};
+			throw new BadRequest('Account not found');
 		}
 	}
 }
diff --git a/src/services/accounts/AccountsVestingInfoService.ts b/src/services/accounts/AccountsVestingInfoService.ts
@@ -23,7 +23,7 @@ export class AccountsVestingInfoService extends AbstractService {
 
 		const at = {
 			hash,
-			height: number.toNumber().toString(10),
+			height: number.unwrap().toString(10),
 		};
 
 		return {