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

Switch function name to destroyAndSend

Browse Source
This commit is contained in:
Maxim Averin
2017-05-09 23:20:44 +03:00
parent 4de772f5ed
commit cf7bc06856
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/lifecycle/Destructible.sol
View File

@ -7,14 +7,13 @@ import "../ownership/Ownable.sol";
/* /*
* Destructible * Destructible
* Base contract that can be destroyed by owner. All funds in contract will be sent to the owner. * Base contract that can be destroyed by owner. All funds in contract will be sent to the owner.
* In second function all funds will be sent to the recepient.
*/ */
contract Destructible is Ownable { contract Destructible is Ownable {
function destroy() onlyOwner { function destroy() onlyOwner {
selfdestruct(owner); selfdestruct(owner);
} }
function destroyAndSendRecepient(address _recipient) onlyOwner { function destroyAndSend(address _recipient) onlyOwner {
selfdestruct(_recipient); selfdestruct(_recipient);
} }
} }

2
docs/source/killable.rst
View File

@ -10,7 +10,7 @@ destroy( ) onlyOwner
Destroys the contract and sends funds back to the owner. Destroys the contract and sends funds back to the owner.
destroyAndSendRecepient(address _recipient) onlyOwner destroyAndSend(address _recipient) onlyOwner
""""""""""""""""""" """""""""""""""""""
Destroys the contract and sends funds back to the _recepient. Destroys the contract and sends funds back to the _recepient.

2
test/Destructible.js
View File

@ -18,7 +18,7 @@ contract('Destructible', function(accounts) {
let destructible = await Destructible.new({from: accounts[0], value: web3.toWei('10','ether')}); let destructible = await Destructible.new({from: accounts[0], value: web3.toWei('10','ether')});
let owner = await destructible.owner(); let owner = await destructible.owner();
let initBalance = web3.eth.getBalance(accounts[1]); let initBalance = web3.eth.getBalance(accounts[1]);
await destructible.destroyAndSendRecepient(accounts[1], {from: owner} ); await destructible.destroyAndSend(accounts[1], {from: owner} );
let newBalance = web3.eth.getBalance(accounts[1]); let newBalance = web3.eth.getBalance(accounts[1]);
assert.isTrue(newBalance.greaterThan(initBalance)); assert.isTrue(newBalance.greaterThan(initBalance));
}); });