Remove empty unchained function calls

contracts/TransformConstructor.sol

@@ -37,14 +37,18 @@ contract Bar3 is Bar2 {
 }
 
 contract Foo5 {
-    constructor(function () external f) public {}
+    constructor(function () external f) public {
+        f();
+    }
 }
 
 contract Foo6 {
     constructor(
         uint a,
         uint b
-    ) public {}
+    ) public {
+        a = a + b;
+    }
 }
 
 contract Foo7 {
@@ -55,3 +59,58 @@ contract Foo7 {
         a = _a;
     }
 }
+
+contract Foo8 {
+
+    modifier hasModifier() {
+        _;
+    }
+
+    constructor() public hasModifier {
+    }
+}
+
+contract Foo9 {
+    constructor(
+        uint a,
+        uint b
+    ) public {
+        a = 0;
+        b = 0;
+    }
+}
+
+contract Foo10 is Foo7(123) {
+
+    uint bar = 1;
+}
+
+contract Foo11 is Foo7 {
+
+    modifier hasModifier() {
+        _;
+    }
+
+    constructor(uint a) Foo7(a) public hasModifier {
+    }
+}
+
+contract Foo12 is Foo7 {
+
+    constructor(uint a) Foo7(a) public {
+    }
+}
+
+contract Foo13 is Foo4 {
+    constructor() public { }
+}
+
+contract Foo14 is Foo7 {
+
+    modifier hasModifier() {
+        _;
+    }
+
+    constructor(uint a, uint b) Foo7(a) public hasModifier() {
+    }
+}

contracts/solc-0.6/ClassInheritance.sol

@@ -1,5 +1,9 @@
 pragma solidity ^0.6.0;
 
+interface CIC {
+    function fooBar(uint a) external;
+}
+
 contract CIA {
     uint256 public foo;
     event log(string);
@@ -12,3 +16,11 @@ contract CIA {
 contract CIB is CIA(324) {
     uint256 public val = 123;
 }
+
+contract CID is CIC {
+    uint256 public val = 123;
+
+    function fooBar(uint a) override external{
+
+    }
+}

src/index.test.ts.md

@@ -14,6 +14,10 @@ Generated by [AVA](https://avajs.dev).
       source: `pragma solidity ^0.6.0;␊
       import "../Initializable.sol";␊
       ␊
+      interface CICUpgradeable {␊
+          function fooBar(uint a) external;␊
+      }␊
+      ␊
       contract CIAUpgradeable is Initializable {␊
           uint256 public foo;␊
           event log(string);␊
@@ -40,6 +44,22 @@ Generated by [AVA](https://avajs.dev).
           uint256 public val;␊
           uint256[49] private __gap;␊
       }␊
+      ␊
+      contract CIDUpgradeable is Initializable, CICUpgradeable {␊
+          function __CID_init() internal onlyInitializing {␊
+              __CID_init_unchained();␊
+          }␊
+      ␊
+          function __CID_init_unchained() internal onlyInitializing {␊
+              val = 123;␊
+          }␊
+          uint256 public val;␊
+      ␊
+          function fooBar(uint a) override external{␊
+      ␊
+          }␊
+          uint256[49] private __gap;␊
+      }␊
       `,
     }
 
@@ -55,7 +75,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       contract Parent1Upgradeable is Initializable {␊
           function __Parent1_init() internal onlyInitializing {␊
-              __Parent1_init_unchained();␊
           }␊
       ␊
           function __Parent1_init_unchained() internal onlyInitializing {␊
@@ -70,7 +89,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       contract Parent2Upgradeable is Initializable {␊
           function __Parent2_init() internal onlyInitializing {␊
-              __Parent2_init_unchained();␊
           }␊
       ␊
           function __Parent2_init_unchained() internal onlyInitializing {␊
@@ -82,9 +100,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       contract ChildUpgradeable is Initializable, Parent1Upgradeable, Parent2Upgradeable {␊
           function __Child_init() internal onlyInitializing {␊
-              __Parent1_init_unchained();␊
-              __Parent2_init_unchained();␊
-              __Child_init_unchained();␊
           }␊
       ␊
           function __Child_init_unchained() internal onlyInitializing {␊
@@ -183,7 +198,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       contract DeepUpgradeable is Initializable {␊
           function __Deep_init() internal onlyInitializing {␊
-              __Deep_init_unchained();␊
           }␊
       ␊
           function __Deep_init_unchained() internal onlyInitializing {␊
@@ -278,7 +292,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       contract Imported1Upgradeable is Initializable {␊
           function __Imported1_init(uint256 x, uint256 y) internal onlyInitializing {␊
-              __Imported1_init_unchained(x, y);␊
           }␊
       ␊
           function __Imported1_init_unchained(uint256, uint256) internal onlyInitializing { }␊
@@ -288,7 +301,6 @@ Generated by [AVA](https://avajs.dev).
       contract Imported2Upgradeable is Initializable, Imported1Upgradeable {␊
           function __Imported2_init(uint256 x, uint256 y) internal onlyInitializing {␊
               __Imported1_init_unchained(x, y);␊
-              __Imported2_init_unchained(x, y);␊
           }␊
       ␊
           function __Imported2_init_unchained(uint256, uint256) internal onlyInitializing { }␊
@@ -313,7 +325,6 @@ Generated by [AVA](https://avajs.dev).
           function __Local_init(uint x, uint y) internal onlyInitializing {␊
               __Imported1_init_unchained(x, y);␊
               __Imported2_init_unchained(x, y);␊
-              __Local_init_unchained(x, y);␊
           }␊
       ␊
           function __Local_init_unchained(uint, uint) internal onlyInitializing { }␊
@@ -388,7 +399,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       contract StringConstructorUpgradeable is Initializable {␊
           function __StringConstructor_init(string memory message) internal onlyInitializing {␊
-              __StringConstructor_init_unchained(message);␊
           }␊
       ␊
           function __StringConstructor_init_unchained(string memory) internal onlyInitializing {␊
@@ -425,7 +435,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       abstract contract AbstractContractUpgradeable is Initializable {␊
           function __AbstractContract_init() internal onlyInitializing {␊
-              __AbstractContract_init_unchained();␊
           }␊
       ␊
           function __AbstractContract_init_unchained() internal onlyInitializing {␊
@@ -466,7 +475,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       contract RenameContractUpgradeable is Initializable {␊
           function __RenameContract_init() internal onlyInitializing {␊
-              __RenameContract_init_unchained();␊
           }␊
       ␊
           function __RenameContract_init_unchained() internal onlyInitializing {␊

src/transform-0.8.test.ts.md

@@ -96,7 +96,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     abstract contract T3 is T2 {␊
         function __T3_init() internal onlyInitializing {␊
-            __T3_init_unchained();␊
         }␊
     ␊
         function __T3_init_unchained() internal onlyInitializing {␊

src/transform.test.ts

@@ -137,7 +137,7 @@ test('append initializable import custom', t => {
   t.snapshot(t.context.transform.results()[file]);
 });
 
-test('transform constructor', t => {
+test.only('transform constructor', t => {
   const file = 'contracts/TransformConstructor.sol';
   t.context.transform.apply(transformConstructor);
   t.context.transform.apply(removeLeftoverConstructorHead);

src/transform.test.ts.md

@@ -214,7 +214,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     contract Foo1 {␊
         function __Foo1_init() internal onlyInitializing {␊
-            __Foo1_init_unchained();␊
         }␊
     ␊
         function __Foo1_init_unchained() internal onlyInitializing {␊
@@ -258,7 +257,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     contract Bar1 {␊
         function __Bar1_init() internal onlyInitializing {␊
-            __Bar1_init_unchained();␊
         }␊
     ␊
         function __Bar1_init_unchained() internal onlyInitializing {␊
@@ -268,8 +266,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     contract Bar2 is Bar1 {␊
         function __Bar2_init() internal onlyInitializing {␊
-            __Bar1_init_unchained();␊
-            __Bar2_init_unchained();␊
         }␊
     ␊
         function __Bar2_init_unchained() internal onlyInitializing {␊
@@ -279,9 +275,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     contract Bar3 is Bar2 {␊
         function __Bar3_init() internal onlyInitializing {␊
-            __Bar1_init_unchained();␊
-            __Bar2_init_unchained();␊
-            __Bar3_init_unchained();␊
         }␊
     ␊
         function __Bar3_init_unchained() internal onlyInitializing {␊
@@ -294,7 +287,9 @@ Generated by [AVA](https://avajs.dev).
             __Foo5_init_unchained(f);␊
         }␊
     ␊
-        function __Foo5_init_unchained(function () external) internal onlyInitializing {}␊
+        function __Foo5_init_unchained(function () external f) internal onlyInitializing {␊
+            f();␊
+        }␊
     }␊
     ␊
     contract Foo6 {␊
@@ -306,9 +301,11 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         function __Foo6_init_unchained(␊
-            uint,␊
-            uint␊
-        ) internal onlyInitializing {}␊
+            uint a,␊
+            uint b␊
+        ) internal onlyInitializing {␊
+            a = a + b;␊
+        }␊
     }␊
     ␊
     contract Foo7 {␊
@@ -325,7 +322,98 @@ Generated by [AVA](https://avajs.dev).
             a = _a;␊
         }␊
     }␊
-    `
+    ␊
+    contract Foo8 {␊
+    ␊
+        modifier hasModifier() {␊
+            _;␊
+        }␊
+    ␊
+        function __Foo8_init() internal onlyInitializing {␊
+            __Foo8_init_unchained();␊
+        }␊
+    ␊
+        function __Foo8_init_unchained() internal onlyInitializing {␊
+        }␊
+    }␊
+    ␊
+    contract Foo9 {␊
+        function __Foo9_init(␊
+            uint a,␊
+            uint b␊
+        ) internal onlyInitializing {␊
+            __Foo9_init_unchained(a, b);␊
+        }␊
+    ␊
+        function __Foo9_init_unchained(␊
+            uint a,␊
+            uint b␊
+        ) internal onlyInitializing {␊
+            a = 0;␊
+            b = 0;␊
+        }␊
+    }␊
+    ␊
+    contract Foo10 is Foo7(123) {␊
+        function __Foo10_init() internal onlyInitializing {␊
+            __Foo7_init_unchained(123);␊
+            __Foo10_init_unchained();␊
+        }␊
+    ␊
+        function __Foo10_init_unchained() internal onlyInitializing {␊
+            bar = 1;␊
+        }␊
+    ␊
+        uint bar = 1;␊
+    }␊
+    ␊
+    contract Foo11 is Foo7 {␊
+    ␊
+        modifier hasModifier() {␊
+            _;␊
+        }␊
+    ␊
+        function __Foo11_init(uint a) internal onlyInitializing {␊
+            __Foo7_init_unchained(a);␊
+            __Foo11_init_unchained(a);␊
+        }␊
+    ␊
+        function __Foo11_init_unchained(uint) internal onlyInitializing {␊
+        }␊
+    }␊
+    ␊
+    contract Foo12 is Foo7 {␊
+    ␊
+        function __Foo12_init(uint a) internal onlyInitializing {␊
+            __Foo7_init_unchained(a);␊
+        }␊
+    ␊
+        function __Foo12_init_unchained(uint) internal onlyInitializing {␊
+        }␊
+    }␊
+    ␊
+    contract Foo13 is Foo4 {␊
+        function __Foo13_init() internal onlyInitializing {␊
+            __Foo4_init_unchained();␊
+        }␊
+    ␊
+        function __Foo13_init_unchained() internal onlyInitializing { }␊
+    }␊
+    ␊
+    contract Foo14 is Foo7 {␊
+    ␊
+        modifier hasModifier() {␊
+            _;␊
+        }␊
+    ␊
+        function __Foo14_init(uint a, uint b) internal onlyInitializing {␊
+            __Foo7_init_unchained(a);␊
+            __Foo14_init_unchained(a, b);␊
+        }␊
+    ␊
+        function __Foo14_init_unchained(uint, uint) internal onlyInitializing {␊
+        }␊
+    }`
 
 ## fix new statement