aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/token_transfer_proxy/auth.ts
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-02-08 02:27:22 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-02-08 02:27:22 +0800
commitf3c6cce4559d096a2f3babfc7af670d078a6f0dd (patch)
tree580c59d474d52affc57593d25eb1d0acd480d4b0 /packages/contracts/test/token_transfer_proxy/auth.ts
parentd9b1d31e7310f7f554f1740f93e4ccd5b5db90f5 (diff)
parenta26e77074fdf5ea7a754a7a676ebd752668d3c82 (diff)
downloaddexon-0x-contracts-f3c6cce4559d096a2f3babfc7af670d078a6f0dd.tar.gz
dexon-0x-contracts-f3c6cce4559d096a2f3babfc7af670d078a6f0dd.tar.zst
dexon-0x-contracts-f3c6cce4559d096a2f3babfc7af670d078a6f0dd.zip
Merge branch 'development' into feature/testnet-faucets/queue-by-network
* development: (24 commits) Fix Remco's github name in CODEOWNERS Fix ABI error message Stop using definite assignment assertion cause prettier doesn't handle that Special-case ZRXToken snake case conversion Fix linter errors Generate contract wrappers on pre-build Add missing async Remove noImplicitThis Tslint disable no-consecutive-blank-lines in generated files Change compiled sources in contracts Change utils Change tests Add base_contract.ts Remove generated files .gitignore gemerated files Change the list of generated wrappers Change contract templates Add indices for index parameters so that their names don't collide Use abi-gen for events in 0x.js Fix artifacts path ...
Diffstat (limited to 'packages/contracts/test/token_transfer_proxy/auth.ts')
-rw-r--r--packages/contracts/test/token_transfer_proxy/auth.ts36
1 files changed, 19 insertions, 17 deletions
diff --git a/packages/contracts/test/token_transfer_proxy/auth.ts b/packages/contracts/test/token_transfer_proxy/auth.ts
index b2bfc6b65..9d453b079 100644
--- a/packages/contracts/test/token_transfer_proxy/auth.ts
+++ b/packages/contracts/test/token_transfer_proxy/auth.ts
@@ -3,6 +3,7 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
import * as Web3 from 'web3';
+import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy';
import { constants } from '../../util/constants';
import { ContractName } from '../../util/types';
import { chaiSetup } from '../utils/chai_setup';
@@ -18,12 +19,13 @@ describe('TokenTransferProxy', () => {
let owner: string;
let notOwner: string;
let address: string;
- let tokenTransferProxy: Web3.ContractInstance;
+ let tokenTransferProxy: TokenTransferProxyContract;
before(async () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
owner = address = accounts[0];
notOwner = accounts[1];
- tokenTransferProxy = await deployer.deployAsync(ContractName.TokenTransferProxy);
+ const tokenTransferProxyInstance = await deployer.deployAsync(ContractName.TokenTransferProxy);
+ tokenTransferProxy = new TokenTransferProxyContract(tokenTransferProxyInstance);
});
beforeEach(async () => {
await blockchainLifecycle.startAsync();
@@ -33,36 +35,36 @@ describe('TokenTransferProxy', () => {
});
describe('addAuthorizedAddress', () => {
it('should throw if not called by owner', async () => {
- return expect(tokenTransferProxy.addAuthorizedAddress(notOwner, { from: notOwner })).to.be.rejectedWith(
- constants.REVERT,
- );
+ return expect(
+ tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(notOwner, { from: notOwner }),
+ ).to.be.rejectedWith(constants.REVERT);
});
it('should allow owner to add an authorized address', async () => {
- await tokenTransferProxy.addAuthorizedAddress(address, { from: owner });
+ await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
const isAuthorized = await tokenTransferProxy.authorized(address);
expect(isAuthorized).to.be.true();
});
it('should throw if owner attempts to authorize a duplicate address', async () => {
- await tokenTransferProxy.addAuthorizedAddress(address, { from: owner });
- return expect(tokenTransferProxy.addAuthorizedAddress(address, { from: owner })).to.be.rejectedWith(
- constants.REVERT,
- );
+ await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
+ return expect(
+ tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(address, { from: owner }),
+ ).to.be.rejectedWith(constants.REVERT);
});
});
describe('removeAuthorizedAddress', () => {
it('should throw if not called by owner', async () => {
- await tokenTransferProxy.addAuthorizedAddress(address, { from: owner });
+ await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
return expect(
- tokenTransferProxy.removeAuthorizedAddress(address, {
+ tokenTransferProxy.removeAuthorizedAddress.sendTransactionAsync(address, {
from: notOwner,
}),
).to.be.rejectedWith(constants.REVERT);
});
it('should allow owner to remove an authorized address', async () => {
- await tokenTransferProxy.addAuthorizedAddress(address, { from: owner });
- await tokenTransferProxy.removeAuthorizedAddress(address, {
+ await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(address, { from: owner });
+ await tokenTransferProxy.removeAuthorizedAddress.sendTransactionAsync(address, {
from: owner,
});
const isAuthorized = await tokenTransferProxy.authorized(address);
@@ -71,7 +73,7 @@ describe('TokenTransferProxy', () => {
it('should throw if owner attempts to remove an address that is not authorized', async () => {
return expect(
- tokenTransferProxy.removeAuthorizedAddress(address, {
+ tokenTransferProxy.removeAuthorizedAddress.sendTransactionAsync(address, {
from: owner,
}),
).to.be.rejectedWith(constants.REVERT);
@@ -82,14 +84,14 @@ describe('TokenTransferProxy', () => {
it('should return all authorized addresses', async () => {
const initial = await tokenTransferProxy.getAuthorizedAddresses();
expect(initial).to.have.length(0);
- await tokenTransferProxy.addAuthorizedAddress(address, {
+ await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(address, {
from: owner,
});
const afterAdd = await tokenTransferProxy.getAuthorizedAddresses();
expect(afterAdd).to.have.length(1);
expect(afterAdd).to.include(address);
- await tokenTransferProxy.removeAuthorizedAddress(address, {
+ await tokenTransferProxy.removeAuthorizedAddress.sendTransactionAsync(address, {
from: owner,
});
const afterRemove = await tokenTransferProxy.getAuthorizedAddresses();