Skip to content

Commit f8f95ee

Browse files
authored
Update tests for solc 0.7.x (#582)
1 parent c24e5af commit f8f95ee

File tree

150 files changed

+637
-498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+637
-498
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"hardhat-gas-reporter": "^1.0.1",
5858
"mocha": "5.2.0",
5959
"nyc": "^14.1.1",
60-
"solc": "^0.5.10",
61-
"truffle": "5.0.31",
60+
"solc": "^0.7.5",
61+
"truffle": "5.1.43",
6262
"truffle-config": "^1.1.18"
6363
}
6464
}

test/integration/generic/assets/SimpleError.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This contract should throw a parse error in instrumentSolidity.js
2-
pragma solidity ^0.5.0;
2+
pragma solidity ^0.7.0;
33

44
contract SimpleError {
55
uint x = 0;

test/integration/generic/contracts/Migrations.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity >=0.4.22 <0.6.0;
1+
pragma solidity >=0.4.22 <0.8.0;
22

33

44
contract Migrations {

test/integration/projects/contract-subfolders/contracts/A/ContractA2.sol

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33
import "./../B/ContractB2.sol";
44

55
contract ContractA is ContractB {
6-
uint x;
76
constructor() public {
87
}
98

test/integration/projects/contract-subfolders/contracts/B/ContractB2.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractB {

test/integration/projects/contract-subfolders/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports={
88
}
99
},
1010
solidity: {
11-
version: "0.5.15"
11+
version: "0.7.3"
1212
},
1313
paths: {
1414
sources: './contracts/A'

test/integration/projects/ganache-solcoverjs/contracts/ContractA.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractA {

test/integration/projects/ganache-solcoverjs/contracts/ContractB.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractB {

test/integration/projects/ganache-solcoverjs/contracts/ContractC.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractC {

test/integration/projects/ganache-solcoverjs/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");
33

44
module.exports = {
55
solidity: {
6-
version: "0.5.15"
6+
version: "0.7.3"
77
},
88
networks: {
99
coverage: {

test/integration/projects/hardhat-compile-config/contracts/ContractA1.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.5.5;
22

33

44
contract ContractA {

test/integration/projects/hardhat-gas-reporter/contracts/ContractA.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractA {

test/integration/projects/hardhat-gas-reporter/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");
44

55
module.exports = {
66
solidity: {
7-
version: "0.5.15"
7+
version: "0.7.3"
88
},
99
logger: process.env.SILENT ? { log: () => {} } : console,
1010
};

test/integration/projects/import-paths/assets/RelativePathImport.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity >=0.4.21 <0.6.0;
1+
pragma solidity >=0.4.21 <0.8.0;
22

33
contract RelativePathImport {
44
uint r;

test/integration/projects/import-paths/contracts/Migrations.sol

-23
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pragma solidity >=0.4.21 <0.6.0;
1+
pragma solidity >=0.4.21 <0.8.0;
22

33
import "package/AnotherImport.sol";

test/integration/projects/import-paths/contracts/UsesImports.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity >=0.4.21 <0.6.0;
1+
pragma solidity >=0.4.21 <0.8.0;
22

33
import "../assets/RelativePathImport.sol";
44
import "package/NodeModulesImport.sol";

test/integration/projects/import-paths/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");
33

44
module.exports = {
55
solidity: {
6-
version: "0.5.15"
6+
version: "0.7.3"
77
},
88
logger: process.env.SILENT ? { log: () => {} } : console,
99
};

test/integration/projects/import-paths/migrations/1_initial_migration.js

-5
This file was deleted.

test/integration/projects/import-paths/node_modules/package/AnotherImport.sol

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/integration/projects/import-paths/node_modules/package/NodeModulesImport.sol

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/integration/projects/libraries/contracts/CLibrary.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33
library CLibrary {
44
uint constant x = 1;

test/integration/projects/libraries/contracts/Migrations.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity >=0.4.21 <0.6.0;
1+
pragma solidity >=0.4.21 <0.8.0;
22

33
contract Migrations {
44
address public owner;

test/integration/projects/libraries/contracts/PureView.sol

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33
contract PureView {
44

55
// Make sure we aren't corrupting anything with the replace
66
uint notpureview = 5;
77

8-
// Abstract functions to inherit from an uninstrumented, imported file.
9-
function bePure(uint a, uint b) public pure returns (uint);
10-
function beView() public view returns (uint);
11-
128
function inheritedPure(uint a, uint b) public pure returns(uint){
139
return a + b;
1410
}

test/integration/projects/libraries/contracts/UsesPure.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33
import "./_Interface.sol";
44
import "./PureView.sol";
@@ -45,11 +45,11 @@ contract UsesPure is PureView, _Interface {
4545
return onehundred;
4646
}
4747

48-
function stare(uint a, uint b) external {
48+
function stare(uint a, uint b) external override {
4949
uint z = a + b;
5050
}
5151

52-
function cry() external {
52+
function cry() external override {
5353

5454
}
5555
}

test/integration/projects/libraries/contracts/_Interface.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33
interface _Interface {
44
function stare(uint a, uint b) external;

test/integration/projects/libraries/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");
33

44
module.exports = {
55
solidity: {
6-
version: "0.5.15"
6+
version: "0.7.3"
77
},
88
logger: process.env.SILENT ? { log: () => {} } : console,
99
};

test/integration/projects/logical-or/contracts/Contract_OR.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract Contract_OR {

test/integration/projects/logical-or/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");
33

44
module.exports = {
55
solidity: {
6-
version: "0.5.15"
6+
version: "0.7.3"
77
},
88
logger: process.env.SILENT ? { log: () => {} } : console,
99
};

test/integration/projects/multiple-migrations/contracts/ContractA.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractA {

test/integration/projects/multiple-migrations/contracts/ContractB.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractB {

test/integration/projects/multiple-migrations/contracts/ContractC.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractC {

test/integration/projects/multiple-migrations/contracts/Migrations.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity >=0.4.21 <0.6.0;
1+
pragma solidity >=0.4.21 <0.8.0;
22

33
contract Migrations {
44
address public owner;

test/integration/projects/multiple-suites/contracts/ContractA.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractA {

test/integration/projects/multiple-suites/contracts/ContractB.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractB {

test/integration/projects/multiple-suites/contracts/ContractC.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractC {

test/integration/projects/multiple-suites/contracts/Migrations.sol

-23
This file was deleted.

test/integration/projects/multiple-suites/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports={
88
}
99
},
1010
solidity: {
11-
version: "0.5.15"
11+
version: "0.7.3"
1212
},
1313
logger: process.env.SILENT ? { log: () => {} } : console,
1414
};

test/integration/projects/multiple-suites/truffle-config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ module.exports = {
22
networks: {},
33
mocha: {},
44
compilers: {
5-
solc: {}
5+
solc: {
6+
version: "0.7.3"
7+
}
68
}
79
}

test/integration/projects/no-sources/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");
33

44
module.exports = {
55
solidity: {
6-
version: "0.5.15"
6+
version: "0.7.3"
77
},
88
logger: process.env.SILENT ? { log: () => {} } : console,
99
};

test/integration/projects/skipping/contracts/ContractA.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractA {

test/integration/projects/skipping/contracts/Migrations.sol

-23
This file was deleted.

test/integration/projects/skipping/contracts/skipped-folder/ContractB.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractB {

test/integration/projects/skipping/hardhat.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");
33

44
module.exports = {
55
solidity: {
6-
version: "0.5.15"
6+
version: "0.7.3"
77
},
88
logger: process.env.SILENT ? { log: () => {} } : console,
99
};

test/integration/projects/skipping/migrations/1_initial_migration.js

-5
This file was deleted.

test/integration/projects/test-files/contracts/ContractA.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity ^0.5.0;
1+
pragma solidity ^0.7.0;
22

33

44
contract ContractA {

0 commit comments

Comments
 (0)