aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/tokens
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-08-13 13:41:37 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-08-17 08:31:21 +0800
commit09d3d15db093555fa41b24bb3d08da44b08adba2 (patch)
tree0c10c242c34f0fdd0778086b7b2e6a17dc3e4acb /packages/contracts/test/tokens
parent633e6c38c8fe47a8a1ee6fc406704aefa6ed0b3a (diff)
downloaddexon-sol-tools-09d3d15db093555fa41b24bb3d08da44b08adba2.tar
dexon-sol-tools-09d3d15db093555fa41b24bb3d08da44b08adba2.tar.gz
dexon-sol-tools-09d3d15db093555fa41b24bb3d08da44b08adba2.tar.bz2
dexon-sol-tools-09d3d15db093555fa41b24bb3d08da44b08adba2.tar.lz
dexon-sol-tools-09d3d15db093555fa41b24bb3d08da44b08adba2.tar.xz
dexon-sol-tools-09d3d15db093555fa41b24bb3d08da44b08adba2.tar.zst
dexon-sol-tools-09d3d15db093555fa41b24bb3d08da44b08adba2.zip
Fix Geth tests
Diffstat (limited to 'packages/contracts/test/tokens')
-rw-r--r--packages/contracts/test/tokens/erc721_token.ts18
1 files changed, 9 insertions, 9 deletions
diff --git a/packages/contracts/test/tokens/erc721_token.ts b/packages/contracts/test/tokens/erc721_token.ts
index d61db7fbd..bdf4a28a4 100644
--- a/packages/contracts/test/tokens/erc721_token.ts
+++ b/packages/contracts/test/tokens/erc721_token.ts
@@ -14,7 +14,7 @@ import {
InvalidERC721ReceiverTokenReceivedEventArgs,
} from '../../generated_contract_wrappers/invalid_erc721_receiver';
import { artifacts } from '../utils/artifacts';
-import { expectContractCallFailed, expectContractCallFailedWithoutReasonAsync } from '../utils/assertions';
+import { expectTransactionFailedAsync, expectTransactionFailedWithoutReasonAsync } from '../utils/assertions';
import { chaiSetup } from '../utils/chai_setup';
import { constants } from '../utils/constants';
import { LogDecoder } from '../utils/log_decoder';
@@ -71,7 +71,7 @@ describe('ERC721Token', () => {
const from = owner;
const to = erc721Receiver.address;
const unownedTokenId = new BigNumber(2);
- await expectContractCallFailed(
+ await expectTransactionFailedAsync(
token.transferFrom.sendTransactionAsync(from, to, unownedTokenId),
RevertReason.Erc721ZeroOwner,
);
@@ -79,7 +79,7 @@ describe('ERC721Token', () => {
it('should revert if transferring to a null address', async () => {
const from = owner;
const to = constants.NULL_ADDRESS;
- await expectContractCallFailed(
+ await expectTransactionFailedAsync(
token.transferFrom.sendTransactionAsync(from, to, tokenId),
RevertReason.Erc721ZeroToAddress,
);
@@ -87,7 +87,7 @@ describe('ERC721Token', () => {
it('should revert if the from address does not own the token', async () => {
const from = spender;
const to = erc721Receiver.address;
- await expectContractCallFailed(
+ await expectTransactionFailedAsync(
token.transferFrom.sendTransactionAsync(from, to, tokenId),
RevertReason.Erc721OwnerMismatch,
);
@@ -95,7 +95,7 @@ describe('ERC721Token', () => {
it('should revert if spender does not own the token, is not approved, and is not approved for all', async () => {
const from = owner;
const to = erc721Receiver.address;
- await expectContractCallFailed(
+ await expectTransactionFailedAsync(
token.transferFrom.sendTransactionAsync(from, to, tokenId, { from: spender }),
RevertReason.Erc721InvalidSpender,
);
@@ -178,7 +178,7 @@ describe('ERC721Token', () => {
);
const from = owner;
const to = contract.address;
- await expectContractCallFailedWithoutReasonAsync(
+ await expectTransactionFailedWithoutReasonAsync(
token.safeTransferFrom1.sendTransactionAsync(from, to, tokenId),
);
});
@@ -190,7 +190,7 @@ describe('ERC721Token', () => {
);
const from = owner;
const to = invalidErc721Receiver.address;
- await expectContractCallFailed(
+ await expectTransactionFailedAsync(
token.safeTransferFrom1.sendTransactionAsync(from, to, tokenId),
RevertReason.Erc721InvalidSelector,
);
@@ -239,7 +239,7 @@ describe('ERC721Token', () => {
);
const from = owner;
const to = contract.address;
- await expectContractCallFailedWithoutReasonAsync(
+ await expectTransactionFailedWithoutReasonAsync(
token.safeTransferFrom2.sendTransactionAsync(from, to, tokenId, data),
);
});
@@ -251,7 +251,7 @@ describe('ERC721Token', () => {
);
const from = owner;
const to = invalidErc721Receiver.address;
- await expectContractCallFailed(
+ await expectTransactionFailedAsync(
token.safeTransferFrom2.sendTransactionAsync(from, to, tokenId, data),
RevertReason.Erc721InvalidSelector,
);