Selaa lähdekoodia

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
Aniket 7 vuotta sitten
vanhempi
sitoutus
fa1dfbd113

+ 3 - 2
test/BreakInvariantBounty.test.js

@@ -1,4 +1,5 @@
 const { ethGetBalance, ethSendTransaction } = require('./helpers/web3');
+const { sendEther } = require('./helpers/sendTransaction');
 const expectEvent = require('./helpers/expectEvent');
 const { assertRevert } = require('./helpers/assertRevert');
 
@@ -17,13 +18,13 @@ contract('BreakInvariantBounty', function ([_, owner, researcher, anyone, nonTar
   });
 
   it('can set reward', async function () {
-    await ethSendTransaction({ from: owner, to: this.bounty.address, value: reward });
+    await sendEther(owner, this.bounty.address, reward);
     (await ethGetBalance(this.bounty.address)).should.be.bignumber.equal(reward);
   });
 
   context('with reward', function () {
     beforeEach(async function () {
-      await ethSendTransaction({ from: owner, to: this.bounty.address, value: reward });
+      await sendEther(owner, this.bounty.address, reward);
     });
 
     describe('destroy', function () {

+ 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 BigNumber = web3.BigNumber;
 
@@ -58,7 +59,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);
     });
@@ -76,12 +77,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);