From cf7bc06856a641f7043e7c619adf478dbbd4720f Mon Sep 17 00:00:00 2001 From: Maxim Averin Date: Tue, 9 May 2017 23:20:44 +0300 Subject: [PATCH] Switch function name to destroyAndSend --- contracts/lifecycle/Destructible.sol | 3 +-- docs/source/killable.rst | 2 +- test/Destructible.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/contracts/lifecycle/Destructible.sol b/contracts/lifecycle/Destructible.sol index 0f3104949..05d4966f0 100644 --- a/contracts/lifecycle/Destructible.sol +++ b/contracts/lifecycle/Destructible.sol @@ -7,14 +7,13 @@ import "../ownership/Ownable.sol"; /* * Destructible * 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 { function destroy() onlyOwner { selfdestruct(owner); } - function destroyAndSendRecepient(address _recipient) onlyOwner { + function destroyAndSend(address _recipient) onlyOwner { selfdestruct(_recipient); } } diff --git a/docs/source/killable.rst b/docs/source/killable.rst index 4ceae9a8f..fc6c4ff1e 100644 --- a/docs/source/killable.rst +++ b/docs/source/killable.rst @@ -10,7 +10,7 @@ destroy( ) onlyOwner 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. \ No newline at end of file diff --git a/test/Destructible.js b/test/Destructible.js index ae66cfc59..34a7d2be5 100644 --- a/test/Destructible.js +++ b/test/Destructible.js @@ -18,7 +18,7 @@ contract('Destructible', function(accounts) { 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} ); + await destructible.destroyAndSend(accounts[1], {from: owner} ); let newBalance = web3.eth.getBalance(accounts[1]); assert.isTrue(newBalance.greaterThan(initBalance)); });