Add isAnyAddressAvailableAsync

4 files changed, 7 insertions, 6 deletions

diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 08e592729..e885b0e07 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -297,6 +297,7 @@ export class ExchangeWrapper extends ContractWrapper {
     private async isRoundingErrorAsync(takerTokenAmount: BigNumber.BigNumber,
                                        fillTakerAmount: BigNumber.BigNumber,
                                        makerTokenAmount: BigNumber.BigNumber): Promise<boolean> {
+        await assert.isAnyAddressAvailableAsync(this.web3Wrapper);
         const exchangeInstance = await this.getExchangeContractAsync();
         const isRoundingError = await exchangeInstance.isRoundingError.call(
             takerTokenAmount, fillTakerAmount, makerTokenAmount,
diff --git a/src/contract_wrappers/token_wrapper.ts b/src/contract_wrappers/token_wrapper.ts
index d30645548..945f5caf1 100644
--- a/src/contract_wrappers/token_wrapper.ts
+++ b/src/contract_wrappers/token_wrapper.ts
@@ -25,6 +25,7 @@ export class TokenWrapper extends ContractWrapper {
     public async getBalanceAsync(tokenAddress: string, ownerAddress: string): Promise<BigNumber.BigNumber> {
         assert.isETHAddressHex('ownerAddress', ownerAddress);
         assert.isETHAddressHex('tokenAddress', tokenAddress);
+        await assert.isAnyAddressAvailableAsync(this.web3Wrapper);
 
         const tokenContract = await this.getTokenContractAsync(tokenAddress);
         let balance = await tokenContract.balanceOf.call(ownerAddress);
@@ -60,6 +61,7 @@ export class TokenWrapper extends ContractWrapper {
     public async getAllowanceAsync(tokenAddress: string, ownerAddress: string, spenderAddress: string) {
         assert.isETHAddressHex('ownerAddress', ownerAddress);
         assert.isETHAddressHex('tokenAddress', tokenAddress);
+        await assert.isAnyAddressAvailableAsync(this.web3Wrapper);
 
         const tokenContract = await this.getTokenContractAsync(tokenAddress);
         let allowanceInBaseUnits = await tokenContract.allowance.call(ownerAddress, spenderAddress);
diff --git a/src/utils/assert.ts b/src/utils/assert.ts
index 621c11eda..7ab1b7c62 100644
--- a/src/utils/assert.ts
+++ b/src/utils/assert.ts
@@ -37,6 +37,10 @@ export const assert = {
         assert.assert(isSenderAddressAvailable, `Specified ${variableName} ${senderAddressHex} isn't available \ 
                                                  through the supplied web3 instance`);
     },
+    async isAnyAddressAvailableAsync(web3Wrapper: Web3Wrapper): Promise<void> {
+        const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
+        this.assert(!_.isEmpty(availableAddresses), 'No addresses are available on the provided web3 instance');
+    },
     isNumber(variableName: string, value: number): void {
         this.assert(_.isFinite(value), this.typeAssertionMessage(variableName, 'number', value));
     },
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index e1bb29f85..05a8dc063 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -17,12 +17,6 @@ export class Web3Wrapper {
     public isAddress(address: string): boolean {
         return this.web3.isAddress(address);
     }
-    public getDefaultAddress(): string {
-        return this.web3.eth.defaultAccount;
-    }
-    public setDefaultAddress(address: string): void {
-        this.web3.eth.defaultAccount = address;
-    }
     public async isSenderAddressAvailableAsync(senderAddress: string): Promise<boolean> {
         const addresses = await this.getAvailableAddressesAsync();
         return _.includes(addresses, senderAddress);