aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/contracts/test/ether_token.ts3
-rw-r--r--packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts3
-rw-r--r--packages/contracts/test/token_registry.ts3
-rw-r--r--packages/contracts/test/token_transfer_proxy/auth.ts3
-rw-r--r--packages/contracts/test/unlimited_allowance_token_v2.ts24
5 files changed, 22 insertions, 14 deletions
diff --git a/packages/contracts/test/ether_token.ts b/packages/contracts/test/ether_token.ts
index e46d93fe6..31c6c4ed6 100644
--- a/packages/contracts/test/ether_token.ts
+++ b/packages/contracts/test/ether_token.ts
@@ -22,7 +22,6 @@ const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
describe('EtherToken', () => {
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
- let accounts: string[];
let account: string;
const gasPrice = ZeroEx.toBaseUnitAmount(new BigNumber(20), 9);
let zeroEx: ZeroEx;
@@ -34,7 +33,7 @@ describe('EtherToken', () => {
return balance;
};
before(async () => {
- accounts = await web3Wrapper.getAvailableAddressesAsync();
+ const accounts = await web3Wrapper.getAvailableAddressesAsync();
account = accounts[0];
etherTokenAddress = EtherToken.address;
zeroEx = new ZeroEx(web3.currentProvider, {
diff --git a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts b/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
index 27b885438..f8e8c1f8d 100644
--- a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
+++ b/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
@@ -23,7 +23,6 @@ const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
- let accounts: string[];
let owners: string[];
const requiredApprovals = 2;
const SECONDS_TIME_LOCKED = 1000000;
@@ -38,7 +37,7 @@ describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
let validDestination: string;
before(async () => {
- accounts = await web3Wrapper.getAvailableAddressesAsync();
+ const accounts = await web3Wrapper.getAvailableAddressesAsync();
owners = [accounts[0], accounts[1]];
authorizedAddress = `0x${crypto
.solSHA3([accounts[0]])
diff --git a/packages/contracts/test/token_registry.ts b/packages/contracts/test/token_registry.ts
index 1e01dcb6d..bcb620e03 100644
--- a/packages/contracts/test/token_registry.ts
+++ b/packages/contracts/test/token_registry.ts
@@ -23,13 +23,12 @@ const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
describe('TokenRegistry', () => {
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
- let accounts: string[];
let owner: string;
let notOwner: string;
let tokenReg: ContractInstance;
let tokenRegWrapper: TokenRegWrapper;
before(async () => {
- accounts = await web3Wrapper.getAvailableAddressesAsync();
+ const accounts = await web3Wrapper.getAvailableAddressesAsync();
owner = accounts[0];
notOwner = accounts[1];
tokenReg = await TokenRegistry.new();
diff --git a/packages/contracts/test/token_transfer_proxy/auth.ts b/packages/contracts/test/token_transfer_proxy/auth.ts
index 414de9834..399ad2080 100644
--- a/packages/contracts/test/token_transfer_proxy/auth.ts
+++ b/packages/contracts/test/token_transfer_proxy/auth.ts
@@ -17,13 +17,12 @@ const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
describe('TokenTransferProxy', () => {
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
- let accounts: string[];
let owner: string;
let notOwner: string;
let address: string;
let tokenTransferProxy: ContractInstance;
before(async () => {
- accounts = await web3Wrapper.getAvailableAddressesAsync();
+ const accounts = await web3Wrapper.getAvailableAddressesAsync();
owner = address = accounts[0];
notOwner = accounts[1];
tokenTransferProxy = await TokenTransferProxy.deployed();
diff --git a/packages/contracts/test/unlimited_allowance_token_v2.ts b/packages/contracts/test/unlimited_allowance_token_v2.ts
index 47927b913..ebdc3ba11 100644
--- a/packages/contracts/test/unlimited_allowance_token_v2.ts
+++ b/packages/contracts/test/unlimited_allowance_token_v2.ts
@@ -1,5 +1,7 @@
import { ZeroEx } from '0x.js';
+import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { BigNumber } from '@0xproject/utils';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
import * as Web3 from 'web3';
@@ -10,28 +12,38 @@ import { ContractInstance } from '../util/types';
import { chaiSetup } from './utils/chai_setup';
const { DummyTokenV2 } = new Artifacts(artifacts);
-const web3: Web3 = (global as any).web3;
chaiSetup.configure();
const expect = chai.expect;
+const web3: Web3 = (global as any).web3;
+const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
-contract('UnlimitedAllowanceTokenV2', (accounts: string[]) => {
+describe('UnlimitedAllowanceTokenV2', () => {
+ const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const config = {
networkId: constants.TESTRPC_NETWORK_ID,
};
const zeroEx = new ZeroEx(web3.currentProvider, config);
- const owner = accounts[0];
- const spender = accounts[1];
+ let owner: string;
+ let spender: string;
const MAX_MINT_VALUE = new BigNumber(100000000000000000000);
let tokenAddress: string;
let token: ContractInstance;
- beforeEach(async () => {
+ before(async () => {
+ const accounts = await web3Wrapper.getAvailableAddressesAsync();
+ owner = accounts[0];
+ spender = accounts[1];
token = await DummyTokenV2.new({ from: owner });
await token.mint(MAX_MINT_VALUE, { from: owner });
tokenAddress = token.address;
});
-
+ beforeEach(async () => {
+ await blockchainLifecycle.startAsync();
+ });
+ afterEach(async () => {
+ await blockchainLifecycle.revertAsync();
+ });
describe('transfer', () => {
it('should throw if owner has insufficient balance', async () => {
const ownerBalance = await zeroEx.token.getBalanceAsync(tokenAddress, owner);