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

Remove payable from Destructible constructor (#1107)

Browse Source 
* Destructible no longer has a payable constructor.

* Fixed linter errors.
This commit is contained in:
Nicolás Venturo
2018-07-23 15:44:14 -03:00
committed by GitHub
parent 23074676c4
commit 73be06412f
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/lifecycle/Destructible.sol
View File

@ -9,9 +9,6 @@ import "../ownership/Ownable.sol";
* @dev Base contract that can be destroyed by owner. All funds in contract will be sent to the owner.
*/
contract Destructible is Ownable {
constructor() public payable { }
/**
* @dev Transfers the current balance to the owner and terminates the contract.
*/

7
contracts/mocks/DestructibleMock.sol Normal file
View File

@ -0,0 +1,7 @@
pragma solidity ^0.4.24;
import "../lifecycle/Destructible.sol";
contract DestructibleMock is Destructible {
function() payable public {}
}

10
test/lifecycle/Destructible.test.js
View File

@ -1,9 +1,15 @@
var Destructible = artifacts.require('Destructible');
const DestructibleMock = artifacts.require('DestructibleMock');
const { ethGetBalance } = require('../helpers/web3');
contract('Destructible', function (accounts) {
beforeEach(async function () {
this.destructible = await Destructible.new({ from: accounts[0], value: web3.toWei('10', 'ether') });
this.destructible = await DestructibleMock.new({ from: accounts[0] });
await web3.eth.sendTransaction({
from: accounts[0],
to: this.destructible.address,
value: web3.toWei('10', 'ether'),
});
this.owner = await this.destructible.owner();
});