Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove HasNoEther, HasNoTokens, HasNoContracts, and NoOwner #1254

Merged
merged 8 commits into from
Sep 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions contracts/bounties/BreakInvariantBounty.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ pragma solidity ^0.4.24;


import "../payment/PullPayment.sol";
import "../lifecycle/Destructible.sol";


/**
* @title BreakInvariantBounty
* @dev This bounty will pay out to a researcher if they break invariant logic of the contract.
*/
contract BreakInvariantBounty is PullPayment, Destructible {
contract BreakInvariantBounty is PullPayment, Ownable {
bool public claimed;
mapping(address => address) public researchers;

Expand Down Expand Up @@ -47,6 +46,13 @@ contract BreakInvariantBounty is PullPayment, Destructible {
claimed = true;
}

/**
* @dev Transfers the current balance to the owner and terminates the contract.
*/
function destroy() public onlyOwner {
selfdestruct(owner);
}

/**
* @dev Internal function to deploy the target contract.
* @return A target contract address
Expand Down
22 changes: 0 additions & 22 deletions contracts/lifecycle/Destructible.sol

This file was deleted.

36 changes: 0 additions & 36 deletions contracts/lifecycle/TokenDestructible.sol

This file was deleted.

8 changes: 0 additions & 8 deletions contracts/mocks/DestructibleMock.sol

This file was deleted.

33 changes: 0 additions & 33 deletions contracts/mocks/ERC223TokenMock.sol

This file was deleted.

12 changes: 0 additions & 12 deletions contracts/mocks/HasNoEtherTest.sol

This file was deleted.

22 changes: 0 additions & 22 deletions contracts/ownership/Contactable.sol

This file was deleted.

22 changes: 0 additions & 22 deletions contracts/ownership/HasNoContracts.sol

This file was deleted.

41 changes: 0 additions & 41 deletions contracts/ownership/HasNoEther.sol

This file was deleted.

35 changes: 0 additions & 35 deletions contracts/ownership/HasNoTokens.sol

This file was deleted.

15 changes: 0 additions & 15 deletions contracts/ownership/NoOwner.sol

This file was deleted.

15 changes: 0 additions & 15 deletions contracts/token/ERC721/IDeprecatedERC721.sol

This file was deleted.

33 changes: 0 additions & 33 deletions test/lifecycle/Destructible.test.js

This file was deleted.

39 changes: 0 additions & 39 deletions test/lifecycle/TokenDestructible.test.js

This file was deleted.

Loading