From 7d11f941875d1b18467e11c31e4f1095ef8a2025 Mon Sep 17 00:00:00 2001 From: Alex Kvak Date: Wed, 23 Jan 2019 12:19:45 +0300 Subject: [PATCH] [web3]: fromWei always returns string --- types/web3/utils.d.ts | 3 +-- types/web3/web3-tests.ts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/types/web3/utils.d.ts b/types/web3/utils.d.ts index fa73791615..c9dc3c863d 100644 --- a/types/web3/utils.d.ts +++ b/types/web3/utils.d.ts @@ -61,8 +61,7 @@ export default interface Utils { fromAscii(val: string): string; fromDecimal(val: string | number | BigNumber): string; fromUtf8(val: string): string; - fromWei(val: BigNumber, unit?: Unit): BigNumber; - fromWei(val: string | number, unit?: Unit): string; + fromWei(val: string | number | BigNumber, unit?: Unit): string; hexToBytes(val: string): number[]; hexToNumber(val: string | number | BigNumber): number; hexToNumberString(val: string | number | BigNumber): string; diff --git a/types/web3/web3-tests.ts b/types/web3/web3-tests.ts index d2c3c92302..e13c0a9254 100644 --- a/types/web3/web3-tests.ts +++ b/types/web3/web3-tests.ts @@ -165,8 +165,8 @@ const weiStr: string = web3.utils.toWei("100", "gwei"); const weiBn: BigNumber = web3.utils.toWei(web3.utils.toBN("1")); const rndHex: string = Web3.utils.randomHex(10); const sha3: string = web3.utils.soliditySha3(0, 1, "abc"); -const fromWei1: BigNumber = web3.utils.fromWei(new BigNumber(1)); -const fromWei2: BigNumber = web3.utils.fromWei(new BigNumber(1), "gwei"); +const fromWei1: string = web3.utils.fromWei(new BigNumber(1)); +const fromWei2: string = web3.utils.fromWei(new BigNumber(1), "gwei"); const fromWei3: string = web3.utils.fromWei("1"); const fromWei4: string = web3.utils.fromWei("1", "gwei"); const fromWei5: string = web3.utils.fromWei(1);