From 9dca3b76b5e01967674f5c69a88c52430a532e40 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 Aug 2017 16:58:56 +0200 Subject: rename proxy_wrapper_test to token_transfer_proxy_wrapper_test --- test/proxy_wrapper_test.ts | 31 ------------------------------- test/token_transfer_proxy_wrapper_test.ts | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 test/proxy_wrapper_test.ts create mode 100644 test/token_transfer_proxy_wrapper_test.ts diff --git a/test/proxy_wrapper_test.ts b/test/proxy_wrapper_test.ts deleted file mode 100644 index 8faef0b30..000000000 --- a/test/proxy_wrapper_test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import * as chai from 'chai'; -import {chaiSetup} from './utils/chai_setup'; -import {web3Factory} from './utils/web3_factory'; -import {ZeroEx} from '../src'; -import {TokenTransferProxyWrapper} from '../src/contract_wrappers/token_transfer_proxy_wrapper'; - -chaiSetup.configure(); -const expect = chai.expect; - -describe('TokenTransferProxyWrapper', () => { - let zeroEx: ZeroEx; - before(async () => { - const web3 = web3Factory.create(); - zeroEx = new ZeroEx(web3.currentProvider); - }); - describe('#isAuthorizedAsync', () => { - it('should return false if the address is not authorized', async () => { - const isAuthorized = await zeroEx.proxy.isAuthorizedAsync(ZeroEx.NULL_ADDRESS); - expect(isAuthorized).to.be.false(); - }); - }); - describe('#getAuthorizedAddressesAsync', () => { - it('should return the list of authorized addresses', async () => { - const authorizedAddresses = await zeroEx.proxy.getAuthorizedAddressesAsync(); - for (const authorizedAddress of authorizedAddresses) { - const isAuthorized = await zeroEx.proxy.isAuthorizedAsync(authorizedAddress); - expect(isAuthorized).to.be.true(); - } - }); - }); -}); diff --git a/test/token_transfer_proxy_wrapper_test.ts b/test/token_transfer_proxy_wrapper_test.ts new file mode 100644 index 000000000..8faef0b30 --- /dev/null +++ b/test/token_transfer_proxy_wrapper_test.ts @@ -0,0 +1,31 @@ +import * as chai from 'chai'; +import {chaiSetup} from './utils/chai_setup'; +import {web3Factory} from './utils/web3_factory'; +import {ZeroEx} from '../src'; +import {TokenTransferProxyWrapper} from '../src/contract_wrappers/token_transfer_proxy_wrapper'; + +chaiSetup.configure(); +const expect = chai.expect; + +describe('TokenTransferProxyWrapper', () => { + let zeroEx: ZeroEx; + before(async () => { + const web3 = web3Factory.create(); + zeroEx = new ZeroEx(web3.currentProvider); + }); + describe('#isAuthorizedAsync', () => { + it('should return false if the address is not authorized', async () => { + const isAuthorized = await zeroEx.proxy.isAuthorizedAsync(ZeroEx.NULL_ADDRESS); + expect(isAuthorized).to.be.false(); + }); + }); + describe('#getAuthorizedAddressesAsync', () => { + it('should return the list of authorized addresses', async () => { + const authorizedAddresses = await zeroEx.proxy.getAuthorizedAddressesAsync(); + for (const authorizedAddress of authorizedAddresses) { + const isAuthorized = await zeroEx.proxy.isAuthorizedAsync(authorizedAddress); + expect(isAuthorized).to.be.true(); + } + }); + }); +}); -- cgit v1.2.3 From e3f7b18debdcaee3a9120bde6e0337994f85f4ba Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 Aug 2017 17:01:45 +0200 Subject: Add getContractAddressAsync public method to proxy instance --- src/contract_wrappers/token_transfer_proxy_wrapper.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/contract_wrappers/token_transfer_proxy_wrapper.ts b/src/contract_wrappers/token_transfer_proxy_wrapper.ts index 39263efac..758c07f18 100644 --- a/src/contract_wrappers/token_transfer_proxy_wrapper.ts +++ b/src/contract_wrappers/token_transfer_proxy_wrapper.ts @@ -27,6 +27,15 @@ export class TokenTransferProxyWrapper extends ContractWrapper { const authorizedAddresses = await tokenTransferProxyContractInstance.getAuthorizedAddresses.call(); return authorizedAddresses; } + /** + * Retrieves the Ethereum address of the TokenTransferProxy contract deployed on the network + * that the user-passed web3 provider is connected to. + * @returns The Ethereum address of the TokenTransferProxy contract being used. + */ + public async getContractAddressAsync(): Promise { + const proxyInstance = await this._getTokenTransferProxyContractAsync(); + return proxyInstance.address; + } private _invalidateContractInstance(): void { delete this._tokenTransferProxyContractIfExists; } -- cgit v1.2.3 From e4393fdd09e74a036fb444f67aaebc42e8db5c6c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 Aug 2017 17:02:48 +0200 Subject: Add note about the added public method in CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cdda5785..ef2d84db2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ v0.9.4 - _TBD_ ------------------------ * Add clear error message when checksummed address is passed to a public method (#124) * Fixes the description of `shouldThrowOnInsufficientBalanceOrAllowance` in docs (#127) + * Add `zeroEx.proxy.getContractAddressAsync` to public interface v0.9.3 - _Aug 22, 2017_ ------------------------ -- cgit v1.2.3 From 8ba3d608c3c7256379ad9de8c53ecb20460b642a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 Aug 2017 17:30:53 +0200 Subject: Add PR numbers to changelog items --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef2d84db2..3ca451d85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,16 @@ v0.9.4 - _TBD_ ------------------------ * Add clear error message when checksummed address is passed to a public method (#124) * Fixes the description of `shouldThrowOnInsufficientBalanceOrAllowance` in docs (#127) - * Add `zeroEx.proxy.getContractAddressAsync` to public interface + * Add `zeroEx.proxy.getContractAddressAsync` to public interface (#130) v0.9.3 - _Aug 22, 2017_ ------------------------ - * Update contract artifacts to include latest Kovan and Mainnet deploys. + * Update contract artifacts to include latest Kovan and Mainnet deploys (#118) v0.9.2 - _Aug 21, 2017_ ------------------------ * *This version was unpublished because of a publishing issue.* - * Update contract artifacts to include latest Kovan and Mainnet deploys. + * Update contract artifacts to include latest Kovan and Mainnet deploys (#118) v0.9.1 - _Aug. 16, 2017_ ------------------------ -- cgit v1.2.3 From f7010dfa3a4bbd00ba1f08b1bed411c6a60008a4 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 Aug 2017 17:32:10 +0200 Subject: Return variable instead of expression --- src/contract_wrappers/exchange_wrapper.ts | 3 ++- src/contract_wrappers/token_transfer_proxy_wrapper.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index d5e272c12..7994ee72f 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -623,7 +623,8 @@ export class ExchangeWrapper extends ContractWrapper { */ public async getContractAddressAsync(): Promise { const exchangeInstance = await this._getExchangeContractAsync(); - return exchangeInstance.address; + const exchangeAddress = exchangeInstance.address; + return exchangeAddress; } private async _invalidateContractInstancesAsync(): Promise { await this.stopWatchingAllEventsAsync(); diff --git a/src/contract_wrappers/token_transfer_proxy_wrapper.ts b/src/contract_wrappers/token_transfer_proxy_wrapper.ts index 758c07f18..da17d79ff 100644 --- a/src/contract_wrappers/token_transfer_proxy_wrapper.ts +++ b/src/contract_wrappers/token_transfer_proxy_wrapper.ts @@ -34,7 +34,8 @@ export class TokenTransferProxyWrapper extends ContractWrapper { */ public async getContractAddressAsync(): Promise { const proxyInstance = await this._getTokenTransferProxyContractAsync(); - return proxyInstance.address; + const proxyAddress = proxyInstance.address; + return proxyAddress; } private _invalidateContractInstance(): void { delete this._tokenTransferProxyContractIfExists; -- cgit v1.2.3