Browse Source

Fix #1358 Test helper to send funds (#1367)

* signing prefix added

* Minor improvement

* Tests changed

* Successfully tested

* Minor improvements

* Minor improvements

* Revert "Dangling commas are now required. (#1359)"

This reverts commit a6889776f46adca374b6ebf014aa7b0038112a9d.

* fixes #1358

* linting done

* suggested changes

(cherry picked from commit fa1dfbd113dee461ab9860514c9ad487fabfcfee)
Aniket 7 years ago
parent
commit
c25a1e366f
2 changed files with 14 additions and 4 deletions
  1. 9 0
      test/helpers/sendTransaction.js
  2. 5 4
      test/payment/SplitPayment.test.js

+ 9 - 0
test/helpers/sendTransaction.js

@@ -15,7 +15,16 @@ function sendTransaction (target, name, argsTypes, argsValues, 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 = {
   findMethod,
   sendTransaction,
+  sendEther,
 };

+ 5 - 4
test/payment/SplitPayment.test.js

@@ -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 { ZERO_ADDRESS } = require('./../helpers/constants');
 
@@ -59,7 +60,7 @@ contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1,
     });
 
     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);
     });
@@ -77,12 +78,12 @@ contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1,
     });
 
     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);
     });
 
     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
       const initBalance = await ethGetBalance(this.contract.address);