mirror
/
openzeppelin-contracts
mirror of https://github.com/OpenZeppelin/openzeppelin-contracts
2
1
Fork 1
Code Issues Releases Wiki Activity

Add findMethod function in ERC827Token test

Browse Source
pull/518/head
AugustoL 7 years ago
parent 7bd95b1e31
commit e911b4d556
1 changed files with 98 additions and 84 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 60
      test/ERC827Token.js

60
test/ERC827Token.js
Unescape View File

@ -4,6 +4,7 @@ var Message = artifacts.require('./mock/MessageHelper.sol');
var ERC827TokenMock = artifacts.require('./mock/ERC827TokenMock.sol');
var BigNumber = web3.BigNumber;
var _ = require('lodash');
var ethjsABI = require('ethjs-abi');
require('chai')
.use(require('chai-as-promised'))
@ -13,6 +14,15 @@ require('chai')
contract('ERC827 Token', function (accounts) {
let token;
function findMethod (abi, name, args) {
for (var i = 0; i < abi.length; i++) {
const methodArgs = _.map(abi[i].inputs, 'type').join(',');
if ((abi[i].name === name) && (methodArgs === args)) {
return abi[i];
}
}
}
beforeEach(async function () {
token = await ERC827TokenMock.new(accounts[0], 100);
});
@ -111,16 +121,16 @@ contract('ERC827 Token', function (accounts) {
});
describe('Test ERC827 methods', function () {
it('should return correct balances after transfer (with data) and show the event on receiver contract', async function () {
it(
'should return correct balances after transfer (with data) and show the event on receiver contract'
, async function () {
const message = await Message.new();
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
// Use method #8 tranfer of the abi to encode the data tx
const transferData = ethjsABI.encodeMethod(token.abi[8],
const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes');
const transferData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 100, extraData]
);
const transaction = await token.sendTransaction(
@ -134,15 +144,17 @@ contract('ERC827 Token', function (accounts) {
);
});
it('should return correct allowance after approve (with data) and show the event on receiver contract', async function () {
it(
'should return correct allowance after approve (with data) and show the event on receiver contract'
, async function () {
const message = await Message.new();
const extraData = message.contract.showMessage.getData(
web3.toHex(123456), 666, 'Transfer Done'
);
// Use method #3 approve of the abi to encode the data tx
const approveData = ethjsABI.encodeMethod(token.abi[3],
const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes');
const approveData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 100, extraData]
);
const transaction = await token.sendTransaction(
@ -156,7 +168,9 @@ contract('ERC827 Token', function (accounts) {
);
});
it('should return correct balances after transferFrom (with data) and show the event on receiver contract', async function () {
it(
'should return correct balances after transferFrom (with data) and show the event on receiver contract'
, async function () {
const message = await Message.new();
const extraData = message.contract.showMessage.getData(
@ -169,8 +183,8 @@ contract('ERC827 Token', function (accounts) {
await token.allowance(accounts[0], accounts[1])
);
// Use method #7 transferFrom of the abi to encode the data tx
const transferFromData = ethjsABI.encodeMethod(token.abi[7],
const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes');
const transferFromData = ethjsABI.encodeMethod(abiMethod,
[accounts[0], message.contract.address, 100, extraData]
);
const transaction = await token.sendTransaction(
@ -189,8 +203,8 @@ contract('ERC827 Token', function (accounts) {
const extraData = message.contract.fail.getData();
// Use method #3 approve of the abi to encode the data tx
const approveData = ethjsABI.encodeMethod(token.abi[3],
const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes');
const approveData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 10, extraData]
);
await token.sendTransaction(
@ -207,8 +221,8 @@ contract('ERC827 Token', function (accounts) {
const extraData = message.contract.fail.getData();
// Use method #8 tranfer of the abi to encode the data tx
const transferData = ethjsABI.encodeMethod(token.abi[8],
const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes');
const transferData = ethjsABI.encodeMethod(abiMethod,
[message.contract.address, 10, extraData]
);
await token.sendTransaction(
@ -227,8 +241,8 @@ contract('ERC827 Token', function (accounts) {
await token.approve(accounts[1], 10, { from: accounts[2] });
// Use method #7 tranferFrom of the abi to encode the data tx
const transferFromData = ethjsABI.encodeMethod(token.abi[7],
const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes');
const transferFromData = ethjsABI.encodeMethod(abiMethod,
[accounts[2], message.contract.address, 10, extraData]
);
await token.sendTransaction(
@ -249,8 +263,8 @@ contract('ERC827 Token', function (accounts) {
web3.toHex(123456), 666, 'Transfer Done'
);
// Use method #3 approve of the abi to encode the data tx
const approveData = ethjsABI.encodeMethod(token.abi[3],
const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes');
const approveData = ethjsABI.encodeMethod(abiMethod,
[token.contract.address, 100, extraData]
);
await token.sendTransaction(
@ -265,8 +279,8 @@ contract('ERC827 Token', function (accounts) {
web3.toHex(123456), 666, 'Transfer Done'
);
// Use method #8 tranfer of the abi to encode the data tx
const transferData = ethjsABI.encodeMethod(token.abi[8],
const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes');
const transferData = ethjsABI.encodeMethod(abiMethod,
[token.contract.address, 100, extraData]
);
await token.sendTransaction(
@ -283,8 +297,8 @@ contract('ERC827 Token', function (accounts) {
await token.approve(accounts[1], 1, { from: accounts[0] });
// Use method #7 tranferFrom of the abi to encode the data tx
const transferFromData = ethjsABI.encodeMethod(token.abi[7],
const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes');
const transferFromData = ethjsABI.encodeMethod(abiMethod,
[accounts[0], token.contract.address, 1, extraData]
);
await token.sendTransaction(

Write Preview
Loading…
Cancel
Save