solc 0.6.8 fixes to the test contracts

argentlabs · May 21, 2020 · 4bfc474 · 4bfc474
1 parent 13509a9
commit 4bfc474
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 5 deletions.
diff --git a/contracts-test/ERC20Approver.sol b/contracts-test/ERC20Approver.sol
@@ -3,6 +3,7 @@ import "../contracts/wallet/BaseWallet.sol";
 import "../contracts/modules/common/BaseModule.sol";
 import "../contracts/modules/common/OnlyOwnerModule.sol";
 
+// SPDX-License-Identifier: GPL-3.0-only
 contract ERC20Approver is BaseModule, OnlyOwnerModule {
 
     bytes32 constant NAME = "ERC20Approver";

diff --git a/contracts-test/FakeWallet.sol b/contracts-test/FakeWallet.sol
@@ -13,6 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 import "../contracts/wallet/BaseWallet.sol";
 

diff --git a/contracts-test/KyberNetworkTest.sol b/contracts-test/KyberNetworkTest.sol
@@ -3,6 +3,7 @@ import "../lib/other/ERC20.sol";
 import "../lib/other/KyberNetwork.sol";
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 
+// SPDX-License-Identifier: GPL-3.0-only
 contract KyberNetworkTest is KyberNetwork {
 
     using SafeMath for uint256;
@@ -23,7 +24,7 @@ contract KyberNetworkTest is KyberNetwork {
         owner = msg.sender;
     }
 
-    function() external payable {}
+    receive() external payable {}
 
     /**
     * @dev Adds a tradable token to the Kyber instance

diff --git a/contracts-test/NewTestModule.sol b/contracts-test/NewTestModule.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 import "../contracts/modules/common/BaseModule.sol";

diff --git a/contracts-test/NonCompliantGuardian.sol b/contracts-test/NonCompliantGuardian.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 /**

diff --git a/contracts-test/OldTestModule.sol b/contracts-test/OldTestModule.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 import "../contracts/modules/common/BaseModule.sol";

diff --git a/contracts-test/TestContract.sol b/contracts-test/TestContract.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 import "./TokenConsumer.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";

diff --git a/contracts-test/TestDapp.sol b/contracts-test/TestDapp.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 contract TestDapp {

diff --git a/contracts-test/TestERC20.sol b/contracts-test/TestERC20.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";

diff --git a/contracts-test/TestERC721.sol b/contracts-test/TestERC721.sol
@@ -1,9 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
-import "openzeppelin-solidity/contracts/token/ERC721/ERC721Full.sol";
-import "openzeppelin-solidity/contracts/token/ERC721/ERC721Mintable.sol";
+import "openzeppelin-solidity/contracts/token/ERC721/ERC721.sol";
 
-contract TestERC721 is ERC721Full, ERC721Mintable {
-    constructor() ERC721Full("Argent Kitties", "AGKT") public {
+contract TestERC721 is ERC721 {
+    constructor() ERC721("Argent Kitties", "AGKT") public {
     }
 }
diff --git a/contracts-test/TestModuleRelayer.sol b/contracts-test/TestModuleRelayer.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 import "../contracts/wallet/BaseWallet.sol";
 import "../contracts/modules/common/BaseModule.sol";

diff --git a/contracts-test/TestOnlyOwnerModule.sol b/contracts-test/TestOnlyOwnerModule.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 import "../contracts/wallet/BaseWallet.sol";
 import "../contracts/modules/common/OnlyOwnerModule.sol";

diff --git a/contracts-test/TestRegistry.sol b/contracts-test/TestRegistry.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 // Source https://github.com/christianlundkvist/simple-multisig/blob/master/contracts/TestRegistry.sol
 pragma solidity ^0.6.8;
 

diff --git a/contracts-test/TestUpgradedMakerV2Manager.sol b/contracts-test/TestUpgradedMakerV2Manager.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 import "../contracts/modules/maker/MakerV2Manager.sol";

diff --git a/contracts-test/TokenConsumer.sol b/contracts-test/TokenConsumer.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";

diff --git a/contracts-test/maker/FaucetUser.sol b/contracts-test/maker/FaucetUser.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 import "../../lib/maker/DS/DSToken.sol";

diff --git a/contracts-test/maker/TestCdpManager.sol b/contracts-test/maker/TestCdpManager.sol
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.6.8;
 
 contract TestCdpManager {