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

Update more tests to pass on Geth

Browse Source
This commit is contained in:
Alex Browne
2018-06-01 15:59:34 -07:00
parent 98ffe9931d
commit 2dfc468094
4 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/contracts/src/utils/assertions.ts
View File

@@ -18,3 +18,15 @@ export function expectRevertOrAlwaysFailingTransaction<T>(p: Promise<T>): Promis
);
});
}
export function expectInsufficientFunds<T>(p: Promise<T>): PromiseLike<void> {
return expect(p)
.to.be.rejected()
.then(e => {
expect(e).to.satisfy(
(err: Error) =>
_.includes(err.message, 'insufficient funds') ||
_.includes(err.message, "sender doesn't have enough funds"),
);
});
}

2
packages/contracts/src/utils/constants.ts
View File

@@ -25,6 +25,8 @@ export const constants = {
LIB_BYTES_GTE_20_LENGTH_REQUIRED: 'Length must be greater than or equal to 20.',
LIB_BYTES_GTE_32_LENGTH_REQUIRED: 'Length must be greater than or equal to 32.',
LIB_BYTES_INDEX_OUT_OF_BOUNDS: 'Specified array index is out of bounds.',
ERC20_INSUFFICIENT_BALANCE: 'Insufficient balance to complete transfer.',
ERC20_INSUFFICIENT_ALLOWANCE: 'Insufficient allowance to complete transfer.',
TESTRPC_NETWORK_ID: 50,
AWAIT_TRANSACTION_MINED_MS: 100,
MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,

15
packages/contracts/test/ether_token.ts
View File

@@ -6,6 +6,7 @@ import 'make-promises-safe';
import { WETH9Contract } from '../src/contract_wrappers/generated/weth9';
import { artifacts } from '../src/utils/artifacts';
import { expectInsufficientFunds, expectRevertOrAlwaysFailingTransaction } from '../src/utils/assertions';
import { chaiSetup } from '../src/utils/chai_setup';
import { constants } from '../src/utils/constants';
import { provider, txDefaults, web3Wrapper } from '../src/utils/web3_wrapper';
@@ -41,14 +42,11 @@ describe('EtherToken', () => {
await blockchainLifecycle.revertAsync();
});
describe('deposit', () => {
// TODO(albrow): AssertionError: expected promise to be rejected with an error including 'ender doesn\'t have enough funds to send tx.' but got 'insufficient funds for gas * price + value'
it.skip('should throw if caller attempts to deposit more Ether than caller balance', async () => {
it('should throw if caller attempts to deposit more Ether than caller balance', async () => {
const initEthBalance = await web3Wrapper.getBalanceInWeiAsync(account);
const ethToDeposit = initEthBalance.plus(1);
return expect(etherToken.deposit.sendTransactionAsync({ value: ethToDeposit })).to.be.rejectedWith(
"ender doesn't have enough funds to send tx.",
);
return expectInsufficientFunds(etherToken.deposit.sendTransactionAsync({ value: ethToDeposit }));
});
it('should convert deposited Ether to wrapped Ether tokens', async () => {
@@ -73,13 +71,12 @@ describe('EtherToken', () => {
});
describe('withdraw', () => {
// TODO(albrow): AssertionError: expected promise to be rejected with an error including 'revert' but got 'gas required exceeds allowance or always failing transaction'
it.skip('should throw if caller attempts to withdraw greater than caller balance', async () => {
it('should throw if caller attempts to withdraw greater than caller balance', async () => {
const initEthTokenBalance = await etherToken.balanceOf.callAsync(account);
const ethTokensToWithdraw = initEthTokenBalance.plus(1);
return expect(etherToken.withdraw.sendTransactionAsync(ethTokensToWithdraw)).to.be.rejectedWith(
constants.REVERT,
return expectRevertOrAlwaysFailingTransaction(
etherToken.withdraw.sendTransactionAsync(ethTokensToWithdraw),
);
});

21
packages/contracts/test/unlimited_allowance_token.ts
View File

@@ -53,12 +53,11 @@ describe('UnlimitedAllowanceToken', () => {
await blockchainLifecycle.revertAsync();
});
describe('transfer', () => {
// TODO(albrow): AssertionError: expected promise to be rejected but it was fulfilled with true
it.skip('should throw if owner has insufficient balance', async () => {
it('should throw if owner has insufficient balance', async () => {
const ownerBalance = await token.balanceOf.callAsync(owner);
const amountToTransfer = ownerBalance.plus(1);
return expectRevertOrAlwaysFailingTransaction(
token.transfer.callAsync(spender, amountToTransfer, { from: owner }),
return expect(token.transfer.callAsync(spender, amountToTransfer, { from: owner })).to.be.rejectedWith(
constants.ERC20_INSUFFICIENT_BALANCE,
);
});
@@ -88,23 +87,21 @@ describe('UnlimitedAllowanceToken', () => {
});
describe('transferFrom', () => {
// TODO(albrow): AssertionError: expected promise to be rejected but it was fulfilled with true
it.skip('should throw if owner has insufficient balance', async () => {
it('should throw if owner has insufficient balance', async () => {
const ownerBalance = await token.balanceOf.callAsync(owner);
const amountToTransfer = ownerBalance.plus(1);
await web3Wrapper.awaitTransactionSuccessAsync(
await token.approve.sendTransactionAsync(spender, amountToTransfer, { from: owner }),
constants.AWAIT_TRANSACTION_MINED_MS,
);
return expectRevertOrAlwaysFailingTransaction(
return expect(
token.transferFrom.callAsync(owner, spender, amountToTransfer, {
from: spender,
}),
);
).to.be.rejectedWith(constants.ERC20_INSUFFICIENT_BALANCE);
});
// TODO(albrow): AssertionError: expected promise to be rejected but it was fulfilled with true
it.skip('should throw if spender has insufficient allowance', async () => {
it('should throw if spender has insufficient allowance', async () => {
const ownerBalance = await token.balanceOf.callAsync(owner);
const amountToTransfer = ownerBalance;
@@ -112,11 +109,11 @@ describe('UnlimitedAllowanceToken', () => {
const isSpenderAllowanceInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
expect(isSpenderAllowanceInsufficient).to.be.true();
return expectRevertOrAlwaysFailingTransaction(
return expect(
token.transferFrom.callAsync(owner, spender, amountToTransfer, {
from: spender,
}),
);
).to.be.rejectedWith(constants.ERC20_INSUFFICIENT_ALLOWANCE);
});
it('should return true on a 0 value transfer', async () => {