add destroy function, allowing send funds to recepient

pull/212/head
Maxim Averin 8 years ago
parent f7a7fc3b06
commit 4de772f5ed
  1. 5
      contracts/lifecycle/Destructible.sol
  2. 7
      docs/source/killable.rst
  3. 10
      test/Destructible.js

@ -7,9 +7,14 @@ 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 {
selfdestruct(_recipient);
}
} }

@ -8,4 +8,9 @@ Inherits from contract Ownable.
destroy( ) onlyOwner 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
"""""""""""""""""""
Destroys the contract and sends funds back to the _recepient.

@ -11,8 +11,16 @@ contract('Destructible', function(accounts) {
let initBalance = web3.eth.getBalance(owner); let initBalance = web3.eth.getBalance(owner);
await destructible.destroy({from: owner}); await destructible.destroy({from: owner});
let newBalance = web3.eth.getBalance(owner); let newBalance = web3.eth.getBalance(owner);
assert.isTrue(newBalance > initBalance); assert.isTrue(newBalance > initBalance);
}); });
it('should send balance to recepient after destruction', async function() {
let destructible = await Destructible.new({from: accounts[0], value: web3.toWei('10','ether')});
let owner = await destructible.owner();
let initBalance = web3.eth.getBalance(accounts[1]);
await destructible.destroyAndSendRecepient(accounts[1], {from: owner} );
let newBalance = web3.eth.getBalance(accounts[1]);
assert.isTrue(newBalance.greaterThan(initBalance));
});
}); });

Loading…
Cancel
Save