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

@0x:contracts-exchange Removed code written to transactions

Browse Source
This commit is contained in:
Alex Towle 2019-08-15 15:31:42 -07:00 committed by Amir Bandeali
parent 907771f084
commit 4b970905cf
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contracts/exchange/test/transactions.ts
View File

@ -37,7 +37,6 @@ import {
ExchangeTransactionExecutionEventArgs, ExchangeTransactionExecutionEventArgs,
ExchangeWrapper, ExchangeWrapper,
ExchangeWrapperContract, ExchangeWrapperContract,
TestTransactionsContract,
WhitelistContract, WhitelistContract,
} from '../src/'; } from '../src/';
@ -53,7 +52,6 @@ blockchainTests.resets('Exchange transactions', env => {
let feeRecipientAddress: string; let feeRecipientAddress: string;
let validatorAddress: string; let validatorAddress: string;
let taker2Address: string; let taker2Address: string;
let transactionsContract: TestTransactionsContract;
let erc20TokenA: DummyERC20TokenContract; let erc20TokenA: DummyERC20TokenContract;
let erc20TokenB: DummyERC20TokenContract; let erc20TokenB: DummyERC20TokenContract;
@ -140,13 +138,6 @@ blockchainTests.resets('Exchange transactions', env => {
makerTransactionFactory = new TransactionFactory(makerPrivateKey, exchangeInstance.address, chainId); makerTransactionFactory = new TransactionFactory(makerPrivateKey, exchangeInstance.address, chainId);
takerTransactionFactory = new TransactionFactory(takerPrivateKey, exchangeInstance.address, chainId); takerTransactionFactory = new TransactionFactory(takerPrivateKey, exchangeInstance.address, chainId);
taker2TransactionFactory = new TransactionFactory(taker2PrivateKey, exchangeInstance.address, chainId); taker2TransactionFactory = new TransactionFactory(taker2PrivateKey, exchangeInstance.address, chainId);
transactionsContract = await TestTransactionsContract.deployFrom0xArtifactAsync(
artifacts.TestTransactions,
env.provider,
env.txDefaults,
{},
);
}); });
describe('executeTransaction', () => { describe('executeTransaction', () => {
describe('general functionality', () => { describe('general functionality', () => {
@ -1198,25 +1189,4 @@ blockchainTests.resets('Exchange transactions', env => {
}); });
}); });
}); });
describe('getCurrentContext', () => {
it('should return the sender address when there is not a saved context address', async () => {
const currentContextAddress = await transactionsContract.getCurrentContextAddress.callAsync({
from: makerAddress,
});
expect(currentContextAddress).to.be.eq(makerAddress);
});
it('should return the sender address when there is a saved context address', async () => {
// Set the current context address to the taker address
await transactionsContract.setCurrentContextAddress.sendTransactionAsync(takerAddress, {
from: makerAddress,
});
// Ensure that the queried current context address is the same as the address that was set.
const currentContextAddress = await transactionsContract.getCurrentContextAddress.callAsync({
from: makerAddress,
});
expect(currentContextAddress).to.be.eq(takerAddress);
});
});
}); });