* signing prefix added * Minor improvement * Tests changed * Successfully tested * Minor improvements * Minor improvements * Revert "Dangling commas are now required. (#1359)" This reverts commita6889776f4. * fixes #1358 * linting done * suggested changes (cherry picked from commitfa1dfbd113)
This commit is contained in:
@ -15,7 +15,16 @@ function sendTransaction (target, name, argsTypes, argsValues, opts) {
|
|||||||
return target.sendTransaction(Object.assign({ data: encodedData }, opts));
|
return target.sendTransaction(Object.assign({ data: encodedData }, opts));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function sendEther (from, to, value) {
|
||||||
|
web3.eth.sendTransaction({
|
||||||
|
from: from,
|
||||||
|
to: to,
|
||||||
|
value: value,
|
||||||
|
gasPrice: 0,
|
||||||
|
});
|
||||||
|
}
|
||||||
module.exports = {
|
module.exports = {
|
||||||
findMethod,
|
findMethod,
|
||||||
sendTransaction,
|
sendTransaction,
|
||||||
|
sendEther,
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
const { ethGetBalance, ethSendTransaction } = require('../helpers/web3');
|
const { ethGetBalance } = require('../helpers/web3');
|
||||||
|
const { sendEther } = require('./../helpers/sendTransaction');
|
||||||
const { ether } = require('../helpers/ether');
|
const { ether } = require('../helpers/ether');
|
||||||
const { ZERO_ADDRESS } = require('./../helpers/constants');
|
const { ZERO_ADDRESS } = require('./../helpers/constants');
|
||||||
|
|
||||||
@ -59,7 +60,7 @@ contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1,
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should accept payments', async function () {
|
it('should accept payments', async function () {
|
||||||
await ethSendTransaction({ from: owner, to: this.contract.address, value: amount });
|
await sendEther(owner, this.contract.address, amount);
|
||||||
|
|
||||||
(await ethGetBalance(this.contract.address)).should.be.bignumber.equal(amount);
|
(await ethGetBalance(this.contract.address)).should.be.bignumber.equal(amount);
|
||||||
});
|
});
|
||||||
@ -77,12 +78,12 @@ contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1,
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should throw if non-payee want to claim', async function () {
|
it('should throw if non-payee want to claim', async function () {
|
||||||
await ethSendTransaction({ from: payer1, to: this.contract.address, value: amount });
|
await sendEther(payer1, this.contract.address, amount);
|
||||||
await expectThrow(this.contract.release(nonpayee1), EVMRevert);
|
await expectThrow(this.contract.release(nonpayee1), EVMRevert);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should distribute funds to payees', async function () {
|
it('should distribute funds to payees', async function () {
|
||||||
await ethSendTransaction({ from: payer1, to: this.contract.address, value: amount });
|
await sendEther(payer1, this.contract.address, amount);
|
||||||
|
|
||||||
// receive funds
|
// receive funds
|
||||||
const initBalance = await ethGetBalance(this.contract.address);
|
const initBalance = await ethGetBalance(this.contract.address);
|
||||||
|
|||||||
Reference in New Issue
Block a user