Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
ff61c7d9
Commit
ff61c7d9
authored
May 15, 2017
by
Manuel Aráoz
Committed by
GitHub
May 15, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #212 from misteraverin/feature/destructible
Add destroy function, allowing send funds to recepient.
parents
726593c0
cf7bc068
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
Destructible.sol
contracts/lifecycle/Destructible.sol
+4
-0
killable.rst
docs/source/killable.rst
+7
-2
Destructible.js
test/Destructible.js
+9
-1
No files found.
contracts/lifecycle/Destructible.sol
View file @
ff61c7d9
...
...
@@ -12,4 +12,8 @@ contract Destructible is Ownable {
function destroy() onlyOwner {
selfdestruct(owner);
}
function destroyAndSend(address _recipient) onlyOwner {
selfdestruct(_recipient);
}
}
docs/source/killable.rst
View file @
ff61c7d9
...
...
@@ -8,4 +8,9 @@ Inherits from contract Ownable.
destroy( ) onlyOwner
"""""""""""""""""""
Destroys the contract and sends funds back to the owner.
\ No newline at end of file
Destroys the contract and sends funds back to the owner.
destroyAndSend(address _recipient) onlyOwner
"""""""""""""""""""
Destroys the contract and sends funds back to the _recepient.
\ No newline at end of file
test/Destructible.js
View file @
ff61c7d9
...
...
@@ -11,8 +11,16 @@ contract('Destructible', function(accounts) {
let
initBalance
=
web3
.
eth
.
getBalance
(
owner
);
await
destructible
.
destroy
({
from
:
owner
});
let
newBalance
=
web3
.
eth
.
getBalance
(
owner
);
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
.
destroyAndSend
(
accounts
[
1
],
{
from
:
owner
}
);
let
newBalance
=
web3
.
eth
.
getBalance
(
accounts
[
1
]);
assert
.
isTrue
(
newBalance
.
greaterThan
(
initBalance
));
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment