#814 Use strict OVM compiler (removes SelfDestructible)

Merged Alejandro Santander ajsantander

@@ -2,7 +2,6 @@
Loading
2 2
3 3
// Inheritance
4 4
import "./Owned.sol";
5 -
import "./SelfDestructible.sol";
6 5
import "./LimitedSetup.sol";
7 6
8 7
// Libraries
@@ -13,7 +12,7 @@
Loading
13 12
14 13
15 14
// https://docs.synthetix.io/contracts/FeePoolState
16 -
contract FeePoolState is Owned, SelfDestructible, LimitedSetup {
15 +
contract FeePoolState is Owned, LimitedSetup {
17 16
    using SafeMath for uint;
18 17
    using SafeDecimalMath for uint;
19 18
@@ -32,7 +31,7 @@
Loading
32 31
    // The IssuanceData activity that's happened in a fee period.
33 32
    mapping(address => IssuanceData[FEE_PERIOD_LENGTH]) public accountIssuanceLedger;
34 33
35 -
    constructor(address _owner, IFeePool _feePool) public Owned(_owner) SelfDestructible() LimitedSetup(6 weeks) {
34 +
    constructor(address _owner, IFeePool _feePool) public Owned(_owner) LimitedSetup(6 weeks) {
36 35
        feePool = address(_feePool);
37 36
    }
38 37

@@ -3,7 +3,6 @@
Loading
3 3
// Inheritance
4 4
import "./Owned.sol";
5 5
import "./Proxyable.sol";
6 -
import "./SelfDestructible.sol";
7 6
import "./LimitedSetup.sol";
8 7
import "./MixinResolver.sol";
9 8
import "./MixinSystemSettings.sol";
@@ -29,7 +28,7 @@
Loading
29 28
30 29
31 30
// https://docs.synthetix.io/contracts/FeePool
32 -
contract FeePool is Owned, Proxyable, SelfDestructible, LimitedSetup, MixinResolver, MixinSystemSettings, IFeePool {
31 +
contract FeePool is Owned, Proxyable, LimitedSetup, MixinResolver, MixinSystemSettings, IFeePool {
33 32
    using SafeMath for uint;
34 33
    using SafeDecimalMath for uint;
35 34
@@ -99,7 +98,6 @@
Loading
99 98
    )
100 99
        public
101 100
        Owned(_owner)
102 -
        SelfDestructible()
103 101
        Proxyable(_proxy)
104 102
        LimitedSetup(3 weeks)
105 103
        MixinResolver(_resolver, addressesToCache)

@@ -2,14 +2,13 @@
Loading
2 2
3 3
// Inheritance
4 4
import "./Owned.sol";
5 -
import "./SelfDestructible.sol";
6 5
import "./MixinResolver.sol";
7 6
8 7
// Internal references
9 8
import "./BinaryOptionMarket.sol";
10 9
11 10
12 -
contract BinaryOptionMarketFactory is Owned, SelfDestructible, MixinResolver {
11 +
contract BinaryOptionMarketFactory is Owned, MixinResolver {
13 12
    /* ========== STATE VARIABLES ========== */
14 13
15 14
    /* ---------- Address Resolver Configuration ---------- */
@@ -20,12 +19,7 @@
Loading
20 19
21 20
    /* ========== CONSTRUCTOR ========== */
22 21
23 -
    constructor(address _owner, address _resolver)
24 -
        public
25 -
        Owned(_owner)
26 -
        SelfDestructible()
27 -
        MixinResolver(_resolver, addressesToCache)
28 -
    {}
22 +
    constructor(address _owner, address _resolver) public Owned(_owner) MixinResolver(_resolver, addressesToCache) {}
29 23
30 24
    /* ========== VIEWS ========== */
31 25

@@ -2,7 +2,6 @@
Loading
2 2
3 3
// Inheritance
4 4
import "./Owned.sol";
5 -
import "./SelfDestructible.sol";
6 5
import "./MixinResolver.sol";
7 6
import "./MixinSystemSettings.sol";
8 7
import "./interfaces/IExchangeRates.sol";
@@ -19,7 +18,7 @@
Loading
19 18
20 19
21 20
// https://docs.synthetix.io/contracts/source/contracts/ExchangeRates
22 -
contract ExchangeRates is Owned, SelfDestructible, MixinResolver, MixinSystemSettings, IExchangeRates {
21 +
contract ExchangeRates is Owned, MixinResolver, MixinSystemSettings, IExchangeRates {
23 22
    using SafeMath for uint;
24 23
    using SafeDecimalMath for uint;
25 24
@@ -60,7 +59,7 @@
Loading
60 59
        address _resolver,
61 60
        bytes32[] memory _currencyKeys,
62 61
        uint[] memory _newRates
63 -
    ) public Owned(_owner) SelfDestructible() MixinResolver(_resolver, addressesToCache) MixinSystemSettings() {
62 +
    ) public Owned(_owner) MixinResolver(_resolver, addressesToCache) MixinSystemSettings() {
64 63
        require(_currencyKeys.length == _newRates.length, "Currency key length and rate length must match.");
65 64
66 65
        oracle = _oracle;

@@ -3,7 +3,6 @@
Loading
3 3
// Inheritance
4 4
import "./Owned.sol";
5 5
import "./Pausable.sol";
6 -
import "./SelfDestructible.sol";
7 6
import "./MixinResolver.sol";
8 7
import "./interfaces/IBinaryOptionMarketManager.sol";
9 8
@@ -20,7 +19,7 @@
Loading
20 19
import "./interfaces/IERC20.sol";
21 20
22 21
23 -
contract BinaryOptionMarketManager is Owned, Pausable, SelfDestructible, MixinResolver, IBinaryOptionMarketManager {
22 +
contract BinaryOptionMarketManager is Owned, Pausable, MixinResolver, IBinaryOptionMarketManager {
24 23
    /* ========== LIBRARIES ========== */
25 24
26 25
    using SafeMath for uint;
@@ -86,7 +85,7 @@
Loading
86 85
        uint _poolFee,
87 86
        uint _creatorFee,
88 87
        uint _refundFee
89 -
    ) public Owned(_owner) Pausable() SelfDestructible() MixinResolver(_resolver, addressesToCache) {
88 +
    ) public Owned(_owner) Pausable() MixinResolver(_resolver, addressesToCache) {
90 89
        // Temporarily change the owner so that the setters don't revert.
91 90
        owner = msg.sender;
92 91
        setExpiryDuration(_expiryDuration);

Click to load this diff.
Loading diff...

Click to load this diff.
Loading diff...

Everything is accounted for!

No changes detected that need to be reviewed.
What changes does Codecov check for?
Lines, not adjusted in diff, that have changed coverage data.
Files that introduced coverage data that had none before.
Files that have missing coverage data that once were tracked.

23 Commits

Hiding 2 contexual commits Hiding 5 contexual commits
+1 Files
+3
+5
-2
Pull Request Base Commit
Files Coverage
contracts -0.01% 98.18%
Project Totals (58 files) 98.18%
Loading