crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove truffle from tokenTransferProxy tests

Browse Source
This commit is contained in:
Leonid Logvinov
2018-01-19 13:27:15 +01:00
parent d004df56e3
commit 6463cda204
14 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contracts/test/ts/ether_token.ts → packages/contracts/test/ether_token.ts
View File

@@ -3,8 +3,8 @@ import { BigNumber, promisify } from '@0xproject/utils';
import * as chai from 'chai';
import Web3 = require('web3');
import { Artifacts } from '../../util/artifacts';
import { constants } from '../../util/constants';
import { Artifacts } from '../util/artifacts';
import { constants } from '../util/constants';
import { chaiSetup } from './utils/chai_setup';

16
packages/contracts/test/ts/exchange/core.ts → packages/contracts/test/exchange/core.ts
View File

@@ -4,14 +4,14 @@ import * as chai from 'chai';
import ethUtil = require('ethereumjs-util');
import * as Web3 from 'web3';
import { Artifacts } from '../../../util/artifacts';
import { Balances } from '../../../util/balances';
import { constants } from '../../../util/constants';
import { crypto } from '../../../util/crypto';
import { ExchangeWrapper } from '../../../util/exchange_wrapper';
import { Order } from '../../../util/order';
import { OrderFactory } from '../../../util/order_factory';
import { BalancesByOwner, ContractInstance, ExchangeContractErrs } from '../../../util/types';
import { Artifacts } from '../../util/artifacts';
import { Balances } from '../../util/balances';
import { constants } from '../../util/constants';
import { crypto } from '../../util/crypto';
import { ExchangeWrapper } from '../../util/exchange_wrapper';
import { Order } from '../../util/order';
import { OrderFactory } from '../../util/order_factory';
import { BalancesByOwner, ContractInstance, ExchangeContractErrs } from '../../util/types';
import { chaiSetup } from '../utils/chai_setup';
chaiSetup.configure();

8
packages/contracts/test/ts/exchange/helpers.ts → packages/contracts/test/exchange/helpers.ts
View File

@@ -3,10 +3,10 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import ethUtil = require('ethereumjs-util');
import { Artifacts } from '../../../util/artifacts';
import { ExchangeWrapper } from '../../../util/exchange_wrapper';
import { Order } from '../../../util/order';
import { OrderFactory } from '../../../util/order_factory';
import { Artifacts } from '../../util/artifacts';
import { ExchangeWrapper } from '../../util/exchange_wrapper';
import { Order } from '../../util/order';
import { OrderFactory } from '../../util/order_factory';
import { chaiSetup } from '../utils/chai_setup';
chaiSetup.configure();

14
packages/contracts/test/ts/exchange/wrapper.ts → packages/contracts/test/exchange/wrapper.ts
View File

@@ -3,13 +3,13 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import * as _ from 'lodash';
import { Artifacts } from '../../../util/artifacts';
import { Balances } from '../../../util/balances';
import { constants } from '../../../util/constants';
import { ExchangeWrapper } from '../../../util/exchange_wrapper';
import { Order } from '../../../util/order';
import { OrderFactory } from '../../../util/order_factory';
import { BalancesByOwner, ContractInstance } from '../../../util/types';
import { Artifacts } from '../../util/artifacts';
import { Balances } from '../../util/balances';
import { constants } from '../../util/constants';
import { ExchangeWrapper } from '../../util/exchange_wrapper';
import { Order } from '../../util/order';
import { OrderFactory } from '../../util/order_factory';
import { BalancesByOwner, ContractInstance } from '../../util/types';
import { chaiSetup } from '../utils/chai_setup';
chaiSetup.configure();

10
packages/contracts/test/ts/multi_sig_with_time_lock.ts → packages/contracts/test/multi_sig_with_time_lock.ts
View File

@@ -4,11 +4,11 @@ import * as chai from 'chai';
import Web3 = require('web3');
import * as multiSigWalletJSON from '../../build/contracts/MultiSigWalletWithTimeLock.json';
import * as truffleConf from '../../truffle.js';
import { Artifacts } from '../../util/artifacts';
import { constants } from '../../util/constants';
import { MultiSigWrapper } from '../../util/multi_sig_wrapper';
import { ContractInstance } from '../../util/types';
import * as truffleConf from '../truffle.js';
import { Artifacts } from '../util/artifacts';
import { constants } from '../util/constants';
import { MultiSigWrapper } from '../util/multi_sig_wrapper';
import { ContractInstance } from '../util/types';
import { chaiSetup } from './utils/chai_setup';

10
packages/contracts/test/ts/multi_sig_with_time_lock_except_remove_auth_addr.ts → packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
View File

@@ -1,11 +1,11 @@
import * as chai from 'chai';
import * as tokenTransferProxyJSON from '../../build/contracts/TokenTransferProxy.json';
import { Artifacts } from '../../util/artifacts';
import { constants } from '../../util/constants';
import { crypto } from '../../util/crypto';
import { MultiSigWrapper } from '../../util/multi_sig_wrapper';
import { ContractInstance, TransactionDataParams } from '../../util/types';
import { Artifacts } from '../util/artifacts';
import { constants } from '../util/constants';
import { crypto } from '../util/crypto';
import { MultiSigWrapper } from '../util/multi_sig_wrapper';
import { ContractInstance, TransactionDataParams } from '../util/types';
import { chaiSetup } from './utils/chai_setup';
const { TokenTransferProxy, MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress } = new Artifacts(artifacts);

8
packages/contracts/test/ts/token_registry.ts → packages/contracts/test/token_registry.ts
View File

@@ -3,10 +3,10 @@ import * as chai from 'chai';
import ethUtil = require('ethereumjs-util');
import * as _ from 'lodash';
import { Artifacts } from '../../util/artifacts';
import { constants } from '../../util/constants';
import { TokenRegWrapper } from '../../util/token_registry_wrapper';
import { ContractInstance } from '../../util/types';
import { Artifacts } from '../util/artifacts';
import { constants } from '../util/constants';
import { TokenRegWrapper } from '../util/token_registry_wrapper';
import { ContractInstance } from '../util/types';
import { chaiSetup } from './utils/chai_setup';

4
packages/contracts/test/ts/token_transfer_proxy/auth.ts → packages/contracts/test/token_transfer_proxy/auth.ts
View File

@@ -1,7 +1,7 @@
import * as chai from 'chai';
import { constants } from '../../../util/constants';
import { ContractInstance } from '../../../util/types';
import { constants } from '../../util/constants';
import { ContractInstance } from '../../util/types';
import { chaiSetup } from '../utils/chai_setup';
chaiSetup.configure();

37
packages/contracts/test/ts/token_transfer_proxy/transfer_from.ts → packages/contracts/test/token_transfer_proxy/transfer_from.ts
View File

@@ -1,22 +1,37 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
import * as Web3 from 'web3';
import { Artifacts } from '../../../util/artifacts';
import { Balances } from '../../../util/balances';
import { constants } from '../../../util/constants';
import { ContractInstance } from '../../../util/types';
import { Artifacts } from '../../util/artifacts';
import { Balances } from '../../util/balances';
import { constants } from '../../util/constants';
import { ContractInstance } from '../../util/types';
import { chaiSetup } from '../utils/chai_setup';
chaiSetup.configure();
const expect = chai.expect;
const { TokenTransferProxy, DummyToken, TokenRegistry } = new Artifacts(artifacts);
// In order to benefit from type-safety, we re-assign the global web3 instance injected by Truffle
// with type `any` to a variable of type `Web3`.
const web3: Web3 = (global as any).web3;
const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
contract('TokenTransferProxy', (accounts: string[]) => {
describe('TokenTransferProxy', () => {
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
let accounts: string[];
let owner: string;
let notAuthorized: string;
const config = {
networkId: constants.TESTRPC_NETWORK_ID,
};
before(async () => {
accounts = await web3Wrapper.getAvailableAddressesAsync();
owner = notAuthorized = accounts[0];
});
const INIT_BAL = 100000000;
const INIT_ALLOW = 100000000;
const owner = accounts[0];
const notAuthorized = owner;
let tokenTransferProxy: ContractInstance;
let tokenRegistry: ContractInstance;
let rep: ContractInstance;
@@ -42,6 +57,12 @@ contract('TokenTransferProxy', (accounts: string[]) => {
rep.setBalance(accounts[1], INIT_BAL, { from: owner }),
]);
});
beforeEach(async () => {
await blockchainLifecycle.startAsync();
});
afterEach(async () => {
await blockchainLifecycle.revertAsync();
});
describe('transferFrom', () => {
it('should throw when called by an unauthorized address', async () => {

6
packages/contracts/test/ts/unlimited_allowance_token.ts → packages/contracts/test/unlimited_allowance_token.ts
View File

@@ -3,9 +3,9 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import * as Web3 from 'web3';
import { Artifacts } from '../../util/artifacts';
import { constants } from '../../util/constants';
import { ContractInstance } from '../../util/types';
import { Artifacts } from '../util/artifacts';
import { constants } from '../util/constants';
import { ContractInstance } from '../util/types';
import { chaiSetup } from './utils/chai_setup';

6
packages/contracts/test/ts/unlimited_allowance_token_v2.ts → packages/contracts/test/unlimited_allowance_token_v2.ts
View File

@@ -3,9 +3,9 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import * as Web3 from 'web3';
import { Artifacts } from '../../util/artifacts';
import { constants } from '../../util/constants';
import { ContractInstance } from '../../util/types';
import { Artifacts } from '../util/artifacts';
import { constants } from '../util/constants';
import { ContractInstance } from '../util/types';
import { chaiSetup } from './utils/chai_setup';

0
packages/contracts/test/ts/utils/chai_setup.ts → packages/contracts/test/utils/chai_setup.ts
View File

6
packages/contracts/test/ts/zrx_token.ts → packages/contracts/test/zrx_token.ts
View File

@@ -3,9 +3,9 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import Web3 = require('web3');
import { Artifacts } from '../../util/artifacts';
import { constants } from '../../util/constants';
import { ContractInstance } from '../../util/types';
import { Artifacts } from '../util/artifacts';
import { constants } from '../util/constants';
import { ContractInstance } from '../util/types';
import { chaiSetup } from './utils/chai_setup';

1
packages/contracts/util/constants.ts
View File

@@ -3,6 +3,7 @@ export const constants = {
INVALID_OPCODE: 'invalid opcode',
REVERT: 'revert',
TESTRPC_NETWORK_ID: 50,
RPC_URL: 'http://localhost:8545',
MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,
MAX_TOKEN_TRANSFERFROM_GAS: 80000,
MAX_TOKEN_APPROVE_GAS: 60000,