NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SplitPayment improvements (#1417)

Browse Source 
* Renamed file, added events and set _addPayee to private

* unwanted file

* adjusted test

* adjusted test

* PaymentReceived event added

* Added event testing.

* Fix static tests

(cherry picked from commit a07499796a)
This commit is contained in:
cardmaniac992
2018-10-18 16:26:54 +02:00
committed by Leo Arias
parent 5f3ecd9c64
commit 6db4f0bc8f
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/payment/SplitPayment.test.js → test/payment/PaymentSplitter.test.js
View File

@ -1,4 +1,5 @@
const { ethGetBalance } = require('../helpers/web3');
const expectEvent = require('../helpers/expectEvent');
const { sendEther } = require('./../helpers/sendTransaction');
const { ether } = require('../helpers/ether');
const { ZERO_ADDRESS } = require('./../helpers/constants');
@ -10,33 +11,33 @@ require('chai')
.should();
const shouldFail = require('../helpers/shouldFail');
const SplitPayment = artifacts.require('SplitPayment');
const PaymentSplitter = artifacts.require('PaymentSplitter');
contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1, payer1]) {
contract('PaymentSplitter', function ([_, owner, payee1, payee2, payee3, nonpayee1, payer1]) {
const amount = ether(1.0);
it('rejects an empty set of payees', async function () {
await shouldFail.reverting(SplitPayment.new([], []));
await shouldFail.reverting(PaymentSplitter.new([], []));
});
it('rejects more payees than shares', async function () {
await shouldFail.reverting(SplitPayment.new([payee1, payee2, payee3], [20, 30]));
await shouldFail.reverting(PaymentSplitter.new([payee1, payee2, payee3], [20, 30]));
});
it('rejects more shares than payees', async function () {
await shouldFail.reverting(SplitPayment.new([payee1, payee2], [20, 30, 40]));
await shouldFail.reverting(PaymentSplitter.new([payee1, payee2], [20, 30, 40]));
});
it('rejects null payees', async function () {
await shouldFail.reverting(SplitPayment.new([payee1, ZERO_ADDRESS], [20, 30]));
await shouldFail.reverting(PaymentSplitter.new([payee1, ZERO_ADDRESS], [20, 30]));
});
it('rejects zero-valued shares', async function () {
await shouldFail.reverting(SplitPayment.new([payee1, payee2], [20, 0]));
await shouldFail.reverting(PaymentSplitter.new([payee1, payee2], [20, 0]));
});
it('rejects repeated payees', async function () {
await shouldFail.reverting(SplitPayment.new([payee1, payee1], [20, 30]));
await shouldFail.reverting(PaymentSplitter.new([payee1, payee1], [20, 30]));
});
context('once deployed', function () {
@ -44,7 +45,7 @@ contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1,
this.payees = [payee1, payee2, payee3];
this.shares = [20, 10, 70];
this.contract = await SplitPayment.new(this.payees, this.shares);
this.contract = await PaymentSplitter.new(this.payees, this.shares);
});
it('should have total shares', async function () {
@ -90,19 +91,22 @@ contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1,
// distribute to payees
const initAmount1 = await ethGetBalance(payee1);
await this.contract.release(payee1);
const { logs: logs1 } = await this.contract.release(payee1);
const profit1 = (await ethGetBalance(payee1)).sub(initAmount1);
profit1.sub(web3.toWei(0.20, 'ether')).abs().should.be.bignumber.lt(1e16);
expectEvent.inLogs(logs1, 'PaymentReleased', { to: payee1, amount: profit1 });
const initAmount2 = await ethGetBalance(payee2);
await this.contract.release(payee2);
const { logs: logs2 } = await this.contract.release(payee2);
const profit2 = (await ethGetBalance(payee2)).sub(initAmount2);
profit2.sub(web3.toWei(0.10, 'ether')).abs().should.be.bignumber.lt(1e16);
expectEvent.inLogs(logs2, 'PaymentReleased', { to: payee2, amount: profit2 });
const initAmount3 = await ethGetBalance(payee3);
await this.contract.release(payee3);
const { logs: logs3 } = await this.contract.release(payee3);
const profit3 = (await ethGetBalance(payee3)).sub(initAmount3);
profit3.sub(web3.toWei(0.70, 'ether')).abs().should.be.bignumber.lt(1e16);
expectEvent.inLogs(logs3, 'PaymentReleased', { to: payee3, amount: profit3 });
// end balance should be zero
(await ethGetBalance(this.contract.address)).should.be.bignumber.equal(0);