Skip to content

Update tests for solc 0.7.x #582

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

Merged
merged 4 commits into from
Dec 4, 2020
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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"hardhat-gas-reporter": "^1.0.1",
"mocha": "5.2.0",
"nyc": "^14.1.1",
"solc": "^0.5.10",
"truffle": "5.0.31",
"solc": "^0.7.5",
"truffle": "5.1.43",
"truffle-config": "^1.1.18"
}
}
2 changes: 1 addition & 1 deletion test/integration/generic/assets/SimpleError.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This contract should throw a parse error in instrumentSolidity.js
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;

contract SimpleError {
uint x = 0;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/generic/contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.4.22 <0.6.0;
pragma solidity >=0.4.22 <0.8.0;


contract Migrations {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;

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

contract ContractA is ContractB {
uint x;
constructor() public {
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractB {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports={
}
},
solidity: {
version: "0.5.15"
version: "0.7.3"
},
paths: {
sources: './contracts/A'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractA {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractB {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractC {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");

module.exports = {
solidity: {
version: "0.5.15"
version: "0.7.3"
},
networks: {
coverage: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.5.5;


contract ContractA {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractA {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");

module.exports = {
solidity: {
version: "0.5.15"
version: "0.7.3"
},
logger: process.env.SILENT ? { log: () => {} } : console,
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.4.21 <0.6.0;
pragma solidity >=0.4.21 <0.8.0;

contract RelativePathImport {
uint r;
Expand Down
23 changes: 0 additions & 23 deletions test/integration/projects/import-paths/contracts/Migrations.sol

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pragma solidity >=0.4.21 <0.6.0;
pragma solidity >=0.4.21 <0.8.0;

import "package/AnotherImport.sol";
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.4.21 <0.6.0;
pragma solidity >=0.4.21 <0.8.0;

import "../assets/RelativePathImport.sol";
import "package/NodeModulesImport.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/integration/projects/import-paths/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");

module.exports = {
solidity: {
version: "0.5.15"
version: "0.7.3"
},
logger: process.env.SILENT ? { log: () => {} } : console,
};

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/integration/projects/libraries/contracts/CLibrary.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;

library CLibrary {
uint constant x = 1;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.4.21 <0.6.0;
pragma solidity >=0.4.21 <0.8.0;

contract Migrations {
address public owner;
Expand Down
6 changes: 1 addition & 5 deletions test/integration/projects/libraries/contracts/PureView.sol
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;

contract PureView {

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

// Abstract functions to inherit from an uninstrumented, imported file.
function bePure(uint a, uint b) public pure returns (uint);
function beView() public view returns (uint);

function inheritedPure(uint a, uint b) public pure returns(uint){
return a + b;
}
Expand Down
6 changes: 3 additions & 3 deletions test/integration/projects/libraries/contracts/UsesPure.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;

import "./_Interface.sol";
import "./PureView.sol";
Expand Down Expand Up @@ -45,11 +45,11 @@ contract UsesPure is PureView, _Interface {
return onehundred;
}

function stare(uint a, uint b) external {
function stare(uint a, uint b) external override {
uint z = a + b;
}

function cry() external {
function cry() external override {

}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;

interface _Interface {
function stare(uint a, uint b) external;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/projects/libraries/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");

module.exports = {
solidity: {
version: "0.5.15"
version: "0.7.3"
},
logger: process.env.SILENT ? { log: () => {} } : console,
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract Contract_OR {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/projects/logical-or/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");

module.exports = {
solidity: {
version: "0.5.15"
version: "0.7.3"
},
logger: process.env.SILENT ? { log: () => {} } : console,
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractA {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractB {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractC {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity >=0.4.21 <0.6.0;
pragma solidity >=0.4.21 <0.8.0;

contract Migrations {
address public owner;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractA {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractB {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractC {
Expand Down
23 changes: 0 additions & 23 deletions test/integration/projects/multiple-suites/contracts/Migrations.sol

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports={
}
},
solidity: {
version: "0.5.15"
version: "0.7.3"
},
logger: process.env.SILENT ? { log: () => {} } : console,
};
4 changes: 3 additions & 1 deletion test/integration/projects/multiple-suites/truffle-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ module.exports = {
networks: {},
mocha: {},
compilers: {
solc: {}
solc: {
version: "0.7.3"
}
}
}
2 changes: 1 addition & 1 deletion test/integration/projects/no-sources/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");

module.exports = {
solidity: {
version: "0.5.15"
version: "0.7.3"
},
logger: process.env.SILENT ? { log: () => {} } : console,
};
2 changes: 1 addition & 1 deletion test/integration/projects/skipping/contracts/ContractA.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.7.0;


contract ContractA {
Expand Down
23 changes: 0 additions & 23 deletions test/integration/projects/skipping/contracts/Migrations.sol

This file was deleted.

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


contract ContractB {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/projects/skipping/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin");

module.exports = {
solidity: {
version: "0.5.15"
version: "0.7.3"
},
logger: process.env.SILENT ? { log: () => {} } : console,
};

This file was deleted.

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


contract ContractA {
Expand Down
Loading