From 3ee8bb68149e4882832ac985e31e2ae4a11e6fc5 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 20 Mar 2019 18:07:12 +0000 Subject: [PATCH] Use setSource in tests --- test/libsolidity/ASTJSONTest.cpp | 5 +- test/libsolidity/AnalysisFramework.cpp | 2 +- test/libsolidity/GasMeter.cpp | 4 +- test/libsolidity/Imports.cpp | 239 +++++++++++------- test/libsolidity/Metadata.cpp | 28 +- test/libsolidity/SolidityABIJSON.cpp | 4 +- test/libsolidity/SolidityExecutionFramework.h | 4 +- test/libsolidity/SolidityNatspecJSON.cpp | 8 +- test/libsolidity/SyntaxTest.cpp | 2 +- 9 files changed, 174 insertions(+), 122 deletions(-) diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp index 605fbfc0c..bed667bc4 100644 --- a/test/libsolidity/ASTJSONTest.cpp +++ b/test/libsolidity/ASTJSONTest.cpp @@ -92,13 +92,14 @@ bool ASTJSONTest::run(ostream& _stream, string const& _linePrefix, bool const _f { CompilerStack c; + StringMap sources; map sourceIndices; for (size_t i = 0; i < m_sources.size(); i++) { - c.addSource(m_sources[i].first, m_sources[i].second); + sources[m_sources[i].first] = m_sources[i].second; sourceIndices[m_sources[i].first] = i + 1; } - + c.setSources(sources); c.setEVMVersion(dev::test::Options::get().evmVersion()); c.parseAndAnalyze(); diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp index abeecd327..92db75901 100644 --- a/test/libsolidity/AnalysisFramework.cpp +++ b/test/libsolidity/AnalysisFramework.cpp @@ -48,7 +48,7 @@ AnalysisFramework::parseAnalyseAndReturnError( ) { m_compiler.reset(); - m_compiler.addSource("", _insertVersionPragma ? "pragma solidity >=0.0;\n" + _source : _source); + m_compiler.setSources({{"", _insertVersionPragma ? "pragma solidity >=0.0;\n" + _source : _source}}); m_compiler.setEVMVersion(dev::test::Options::get().evmVersion()); if (!m_compiler.parse()) { diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index 54d3c247c..7ef791c54 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -46,8 +46,8 @@ class GasMeterTestFramework: public SolidityExecutionFramework public: void compile(string const& _sourceCode) { - m_compiler.reset(false); - m_compiler.addSource("", "pragma solidity >=0.0;\n" + _sourceCode); + m_compiler.reset(); + m_compiler.setSources({{"", "pragma solidity >=0.0;\n" + _sourceCode}}); m_compiler.setOptimiserSettings(dev::test::Options::get().optimize); m_compiler.setEVMVersion(m_evmVersion); BOOST_REQUIRE_MESSAGE(m_compiler.compile(), "Compiling contract failed"); diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp index 140401f10..95a538aae 100644 --- a/test/libsolidity/Imports.cpp +++ b/test/libsolidity/Imports.cpp @@ -44,7 +44,7 @@ BOOST_AUTO_TEST_SUITE(SolidityImports) BOOST_AUTO_TEST_CASE(smoke_test) { CompilerStack c; - c.addSource("a", "contract C {} pragma solidity >=0.0;"); + c.setSources({{"a", "contract C {} pragma solidity >=0.0;"}}); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -52,8 +52,10 @@ BOOST_AUTO_TEST_CASE(smoke_test) BOOST_AUTO_TEST_CASE(regular_import) { CompilerStack c; - c.addSource("a", "contract C {} pragma solidity >=0.0;"); - c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract C {} pragma solidity >=0.0;"}, + {"b", "import \"a\"; contract D is C {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -61,8 +63,10 @@ BOOST_AUTO_TEST_CASE(regular_import) BOOST_AUTO_TEST_CASE(import_does_not_clutter_importee) { CompilerStack c; - c.addSource("a", "contract C { D d; } pragma solidity >=0.0;"); - c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract C { D d; } pragma solidity >=0.0;"}, + {"b", "import \"a\"; contract D is C {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -70,9 +74,11 @@ BOOST_AUTO_TEST_CASE(import_does_not_clutter_importee) BOOST_AUTO_TEST_CASE(import_is_transitive) { CompilerStack c; - c.addSource("a", "contract C { } pragma solidity >=0.0;"); - c.addSource("b", "import \"a\"; pragma solidity >=0.0;"); - c.addSource("c", "import \"b\"; contract D is C {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract C { } pragma solidity >=0.0;"}, + {"b", "import \"a\"; pragma solidity >=0.0;"}, + {"c", "import \"b\"; contract D is C {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -80,8 +86,10 @@ BOOST_AUTO_TEST_CASE(import_is_transitive) BOOST_AUTO_TEST_CASE(circular_import) { CompilerStack c; - c.addSource("a", "import \"b\"; contract C { D d; } pragma solidity >=0.0;"); - c.addSource("b", "import \"a\"; contract D { C c; } pragma solidity >=0.0;"); + c.setSources({ + {"a", "import \"b\"; contract C { D d; } pragma solidity >=0.0;"}, + {"b", "import \"a\"; contract D { C c; } pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -89,9 +97,11 @@ BOOST_AUTO_TEST_CASE(circular_import) BOOST_AUTO_TEST_CASE(relative_import) { CompilerStack c; - c.addSource("a", "import \"./dir/b\"; contract A is B {} pragma solidity >=0.0;"); - c.addSource("dir/b", "contract B {} pragma solidity >=0.0;"); - c.addSource("dir/c", "import \"../a\"; contract C is A {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "import \"./dir/b\"; contract A is B {} pragma solidity >=0.0;"}, + {"dir/b", "contract B {} pragma solidity >=0.0;"}, + {"dir/c", "import \"../a\"; contract C is A {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -99,8 +109,10 @@ BOOST_AUTO_TEST_CASE(relative_import) BOOST_AUTO_TEST_CASE(relative_import_multiplex) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("dir/a/b/c", "import \"../../.././a\"; contract B is A {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"dir/a/b/c", "import \"../../.././a\"; contract B is A {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -108,8 +120,10 @@ BOOST_AUTO_TEST_CASE(relative_import_multiplex) BOOST_AUTO_TEST_CASE(simple_alias) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("dir/a/b/c", "import \"../../.././a\" as x; contract B is x.A { function() external { x.A r = x.A(20); } } pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"dir/a/b/c", "import \"../../.././a\" as x; contract B is x.A { function() external { x.A r = x.A(20); } } pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -117,9 +131,11 @@ BOOST_AUTO_TEST_CASE(simple_alias) BOOST_AUTO_TEST_CASE(library_name_clash) { CompilerStack c; - c.addSource("a", "library A {} pragma solidity >=0.0;"); - c.addSource("b", "library A {} pragma solidity >=0.0;"); - c.addSource("c", "import {A} from \"./a\"; import {A} from \"./b\";"); + c.setSources({ + {"a", "library A {} pragma solidity >=0.0;"}, + {"b", "library A {} pragma solidity >=0.0;"}, + {"c", "import {A} from \"./a\"; import {A} from \"./b\";"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -127,8 +143,10 @@ BOOST_AUTO_TEST_CASE(library_name_clash) BOOST_AUTO_TEST_CASE(library_name_clash_with_contract) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("b", "library A {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"b", "library A {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -136,9 +154,11 @@ BOOST_AUTO_TEST_CASE(library_name_clash_with_contract) BOOST_AUTO_TEST_CASE(complex_import) { CompilerStack c; - c.addSource("a", "contract A {} contract B {} contract C { struct S { uint a; } } pragma solidity >=0.0;"); - c.addSource("b", "import \"a\" as x; import {B as b, C as c, C} from \"a\"; " - "contract D is b { function f(c.S memory var1, x.C.S memory var2, C.S memory var3) internal {} } pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} contract B {} contract C { struct S { uint a; } } pragma solidity >=0.0;"}, + {"b", "import \"a\" as x; import {B as b, C as c, C} from \"a\"; " + "contract D is b { function f(c.S memory var1, x.C.S memory var2, C.S memory var3) internal {} } pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -146,8 +166,10 @@ BOOST_AUTO_TEST_CASE(complex_import) BOOST_AUTO_TEST_CASE(name_clash_in_import_1) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("b", "import \"a\"; contract A {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"b", "import \"a\"; contract A {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -155,8 +177,10 @@ BOOST_AUTO_TEST_CASE(name_clash_in_import_1) BOOST_AUTO_TEST_CASE(name_clash_in_import_2) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("b", "import \"a\" as A; contract A {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"b", "import \"a\" as A; contract A {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -164,8 +188,10 @@ BOOST_AUTO_TEST_CASE(name_clash_in_import_2) BOOST_AUTO_TEST_CASE(name_clash_in_import_3) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("b", "import {A as b} from \"a\"; contract b {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"b", "import {A as b} from \"a\"; contract b {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -173,8 +199,10 @@ BOOST_AUTO_TEST_CASE(name_clash_in_import_3) BOOST_AUTO_TEST_CASE(name_clash_in_import_4) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("b", "import {A} from \"a\"; contract A {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"b", "import {A} from \"a\"; contract A {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -182,8 +210,10 @@ BOOST_AUTO_TEST_CASE(name_clash_in_import_4) BOOST_AUTO_TEST_CASE(name_clash_in_import_5) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >=0.0;"); - c.addSource("b", "import {A} from \"a\"; contract B {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "contract A {} pragma solidity >=0.0;"}, + {"b", "import {A} from \"a\"; contract B {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -192,10 +222,12 @@ BOOST_AUTO_TEST_CASE(remappings) { CompilerStack c; c.setRemappings(vector{{"", "s", "s_1.4.6"},{"", "t", "Tee"}}); - c.addSource("a", "import \"s/s.sol\"; contract A is S {} pragma solidity >=0.0;"); - c.addSource("b", "import \"t/tee.sol\"; contract A is Tee {} pragma solidity >=0.0;"); - c.addSource("s_1.4.6/s.sol", "contract S {} pragma solidity >=0.0;"); - c.addSource("Tee/tee.sol", "contract Tee {} pragma solidity >=0.0;"); + c.setSources({ + {"a", "import \"s/s.sol\"; contract A is S {} pragma solidity >=0.0;"}, + {"b", "import \"t/tee.sol\"; contract A is Tee {} pragma solidity >=0.0;"}, + {"s_1.4.6/s.sol", "contract S {} pragma solidity >=0.0;"}, + {"Tee/tee.sol", "contract Tee {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -204,10 +236,12 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings) { CompilerStack c; c.setRemappings(vector{{"a", "s", "s_1.4.6"}, {"b", "s", "s_1.4.7"}}); - c.addSource("a/a.sol", "import \"s/s.sol\"; contract A is SSix {} pragma solidity >=0.0;"); - c.addSource("b/b.sol", "import \"s/s.sol\"; contract B is SSeven {} pragma solidity >=0.0;"); - c.addSource("s_1.4.6/s.sol", "contract SSix {} pragma solidity >=0.0;"); - c.addSource("s_1.4.7/s.sol", "contract SSeven {} pragma solidity >=0.0;"); + c.setSources({ + {"a/a.sol", "import \"s/s.sol\"; contract A is SSix {} pragma solidity >=0.0;"}, + {"b/b.sol", "import \"s/s.sol\"; contract B is SSeven {} pragma solidity >=0.0;"}, + {"s_1.4.6/s.sol", "contract SSix {} pragma solidity >=0.0;"}, + {"s_1.4.7/s.sol", "contract SSeven {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -215,8 +249,10 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings) BOOST_AUTO_TEST_CASE(filename_with_period) { CompilerStack c; - c.addSource("a/a.sol", "import \".b.sol\"; contract A is B {} pragma solidity >=0.0;"); - c.addSource("a/.b.sol", "contract B {} pragma solidity >=0.0;"); + c.setSources({ + {"a/a.sol", "import \".b.sol\"; contract A is B {} pragma solidity >=0.0;"}, + {"a/.b.sol", "contract B {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -229,10 +265,12 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_ensure_default_and_module_pres {"vendor/bar", "foo", "vendor/foo_1.0.0"}, {"", "bar", "vendor/bar"} }); - c.addSource("main.sol", "import \"foo/foo.sol\"; import {Bar} from \"bar/bar.sol\"; contract Main is Foo2, Bar {} pragma solidity >=0.0;"); - c.addSource("vendor/bar/bar.sol", "import \"foo/foo.sol\"; contract Bar {Foo1 foo;} pragma solidity >=0.0;"); - c.addSource("vendor/foo_1.0.0/foo.sol", "contract Foo1 {} pragma solidity >=0.0;"); - c.addSource("vendor/foo_2.0.0/foo.sol", "contract Foo2 {} pragma solidity >=0.0;"); + c.setSources({ + {"main.sol", "import \"foo/foo.sol\"; import {Bar} from \"bar/bar.sol\"; contract Main is Foo2, Bar {} pragma solidity >=0.0;"}, + {"vendor/bar/bar.sol", "import \"foo/foo.sol\"; contract Bar {Foo1 foo;} pragma solidity >=0.0;"}, + {"vendor/foo_1.0.0/foo.sol", "contract Foo1 {} pragma solidity >=0.0;"}, + {"vendor/foo_2.0.0/foo.sol", "contract Foo2 {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -241,10 +279,12 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_1) { CompilerStack c; c.setRemappings(vector{{"a", "x/y/z", "d"}, {"a/b", "x", "e"}}); - c.addSource("a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"); - c.addSource("a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"); - c.addSource("d/z.sol", "contract D {} pragma solidity >=0.0;"); - c.addSource("e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"); + c.setSources({ + {"a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"}, + {"a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"}, + {"d/z.sol", "contract D {} pragma solidity >=0.0;"}, + {"e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -253,10 +293,12 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_2) { CompilerStack c; c.setRemappings(vector{{"a/b", "x", "e"}, {"a", "x/y/z", "d"}}); - c.addSource("a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"); - c.addSource("a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"); - c.addSource("d/z.sol", "contract D {} pragma solidity >=0.0;"); - c.addSource("e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"); + c.setSources({ + {"a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"}, + {"a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"}, + {"d/z.sol", "contract D {} pragma solidity >=0.0;"}, + {"e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); } @@ -264,9 +306,11 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_2) BOOST_AUTO_TEST_CASE(shadowing_via_import) { CompilerStack c; - c.addSource("a", "library A {} pragma solidity >=0.0;"); - c.addSource("b", "library A {} pragma solidity >=0.0;"); - c.addSource("c", "import {A} from \"./a\"; import {A} from \"./b\";"); + c.setSources({ + {"a", "library A {} pragma solidity >=0.0;"}, + {"b", "library A {} pragma solidity >=0.0;"}, + {"c", "import {A} from \"./a\"; import {A} from \"./b\";"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); } @@ -274,13 +318,14 @@ BOOST_AUTO_TEST_CASE(shadowing_via_import) BOOST_AUTO_TEST_CASE(shadowing_builtins_with_imports) { CompilerStack c; - c.addSource("B.sol", "contract X {} pragma solidity >=0.0;"); - c.addSource("b", R"( + c.setSources({ + {"B.sol", "contract X {} pragma solidity >=0.0;"}, + {"b", R"( pragma solidity >=0.0; import * as msg from "B.sol"; contract C { - } - )"); + })"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); size_t errorCount = 0; @@ -301,13 +346,14 @@ BOOST_AUTO_TEST_CASE(shadowing_builtins_with_imports) BOOST_AUTO_TEST_CASE(shadowing_builtins_with_multiple_imports) { CompilerStack c; - c.addSource("B.sol", "contract msg {} contract block{} pragma solidity >=0.0;"); - c.addSource("b", R"( + c.setSources({ + {"B.sol", "contract msg {} contract block{} pragma solidity >=0.0;"}, + {"b", R"( pragma solidity >=0.0; import {msg, block} from "B.sol"; contract C { - } - )"); + })"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); auto numErrors = c.errors().size(); @@ -327,11 +373,12 @@ BOOST_AUTO_TEST_CASE(shadowing_builtins_with_multiple_imports) BOOST_AUTO_TEST_CASE(shadowing_builtins_with_alias) { CompilerStack c; - c.addSource("B.sol", "contract C {} pragma solidity >=0.0;"); - c.addSource("b", R"( + c.setSources({ + {"B.sol", "contract C {} pragma solidity >=0.0;"}, + {"b", R"( pragma solidity >=0.0; - import {C as msg} from "B.sol"; - )"); + import {C as msg} from "B.sol";)"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); auto numErrors = c.errors().size(); @@ -351,7 +398,8 @@ BOOST_AUTO_TEST_CASE(shadowing_builtins_with_alias) BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_mismatch_1) { CompilerStack c; - c.addSource("A.sol", R"( + c.setSources({ + {"A.sol", R"( pragma solidity >=0.0; pragma experimental ABIEncoderV2; @@ -361,22 +409,21 @@ BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_mismatch_1) S public s; function f(S memory _s) returns (S memory,S memory) { } } - )"); - - c.addSource("B.sol", R"( + )"}, + {"B.sol", R"( pragma solidity >=0.0; pragma experimental ABIEncoderV2; import "./A.sol"; contract B is A { } - )"); - - c.addSource("C.sol", R"( + )"}, + {"C.sol", R"( pragma solidity >=0.0; import "./B.sol"; contract C is B { } - )"); + )"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); @@ -401,7 +448,8 @@ BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_mismatch_1) BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_mismatch_2) { CompilerStack c; - c.addSource("A.sol", R"( + c.setSources({ + {"A.sol", R"( pragma solidity >=0.0; pragma experimental ABIEncoderV2; @@ -411,21 +459,20 @@ BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_mismatch_2) S public s; function f(S memory _s) returns (S memory,S memory) { } } - )"); - - c.addSource("B.sol", R"( + )"}, + {"B.sol", R"( pragma solidity >=0.0; import "./A.sol"; contract B is A { } - )"); - - c.addSource("C.sol", R"( + )"}, + {"C.sol", R"( pragma solidity >=0.0; import "./B.sol"; contract C is B { } - )"); + )"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!c.compile()); @@ -450,7 +497,8 @@ BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_mismatch_2) BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_match) { CompilerStack c; - c.addSource("A.sol", R"( + c.setSources({ + {"A.sol", R"( pragma solidity >=0.0; pragma experimental ABIEncoderV2; @@ -460,23 +508,22 @@ BOOST_AUTO_TEST_CASE(inheritance_abi_encoder_match) S public s; function f(S memory _s) public returns (S memory,S memory) { } } - )"); - - c.addSource("B.sol", R"( + )"}, + {"B.sol", R"( pragma solidity >=0.0; pragma experimental ABIEncoderV2; import "./A.sol"; contract B is A { } - )"); - - c.addSource("C.sol", R"( + )"}, + {"C.sol", R"( pragma solidity >=0.0; pragma experimental ABIEncoderV2; import "./B.sol"; contract C is B { } - )"); + )"} + }); c.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(c.compile()); diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp index d1e0cd678..e5b3ef280 100644 --- a/test/libsolidity/Metadata.cpp +++ b/test/libsolidity/Metadata.cpp @@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp) } )"; CompilerStack compilerStack; - compilerStack.addSource("", std::string(sourceCode)); + compilerStack.setSources({{"", std::string(sourceCode)}}); compilerStack.setEVMVersion(dev::test::Options::get().evmVersion()); compilerStack.setOptimiserSettings(dev::test::Options::get().optimize); BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed"); @@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental) } )"; CompilerStack compilerStack; - compilerStack.addSource("", std::string(sourceCode)); + compilerStack.setSources({{"", std::string(sourceCode)}}); compilerStack.setEVMVersion(dev::test::Options::get().evmVersion()); compilerStack.setOptimiserSettings(dev::test::Options::get().optimize); BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed"); @@ -105,20 +105,22 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental) BOOST_AUTO_TEST_CASE(metadata_relevant_sources) { CompilerStack compilerStack; - char const* sourceCode = R"( + char const* sourceCodeA = R"( pragma solidity >=0.0; contract A { function g(function(uint) external returns (uint) x) public {} } )"; - compilerStack.addSource("A", std::string(sourceCode)); - sourceCode = R"( + char const* sourceCodeB = R"( pragma solidity >=0.0; contract B { function g(function(uint) external returns (uint) x) public {} } )"; - compilerStack.addSource("B", std::string(sourceCode)); + compilerStack.setSources({ + {"A", std::string(sourceCodeA)}, + {"B", std::string(sourceCodeB)}, + }); compilerStack.setEVMVersion(dev::test::Options::get().evmVersion()); compilerStack.setOptimiserSettings(dev::test::Options::get().optimize); BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed"); @@ -135,29 +137,31 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources) BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports) { CompilerStack compilerStack; - char const* sourceCode = R"( + char const* sourceCodeA = R"( pragma solidity >=0.0; contract A { function g(function(uint) external returns (uint) x) public {} } )"; - compilerStack.addSource("A", std::string(sourceCode)); - sourceCode = R"( + char const* sourceCodeB = R"( pragma solidity >=0.0; import "./A"; contract B is A { function g(function(uint) external returns (uint) x) public {} } )"; - compilerStack.addSource("B", std::string(sourceCode)); - sourceCode = R"( + char const* sourceCodeC = R"( pragma solidity >=0.0; import "./B"; contract C is B { function g(function(uint) external returns (uint) x) public {} } )"; - compilerStack.addSource("C", std::string(sourceCode)); + compilerStack.setSources({ + {"A", std::string(sourceCodeA)}, + {"B", std::string(sourceCodeB)}, + {"C", std::string(sourceCodeC)} + }); compilerStack.setEVMVersion(dev::test::Options::get().evmVersion()); compilerStack.setOptimiserSettings(dev::test::Options::get().optimize); BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed"); diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index 3acb56257..7905d0b37 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -40,8 +40,8 @@ class JSONInterfaceChecker public: void checkInterface(std::string const& _code, std::string const& _contractName, std::string const& _expectedInterfaceString) { - m_compilerStack.reset(false); - m_compilerStack.addSource("", "pragma solidity >=0.0;\n" + _code); + m_compilerStack.reset(); + m_compilerStack.setSources({{"", "pragma solidity >=0.0;\n" + _code}}); m_compilerStack.setEVMVersion(dev::test::Options::get().evmVersion()); m_compilerStack.setOptimiserSettings(dev::test::Options::get().optimize); BOOST_REQUIRE_MESSAGE(m_compilerStack.parseAndAnalyze(), "Parsing contract failed"); diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index 900d0b9d8..397883987 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -69,8 +69,8 @@ public: if (dev::test::Options::get().useABIEncoderV2 && _sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos) sourceCode += "pragma experimental ABIEncoderV2;\n"; sourceCode += _sourceCode; - m_compiler.reset(false); - m_compiler.addSource("", sourceCode); + m_compiler.reset(); + m_compiler.setSources({{"", sourceCode}}); m_compiler.setLibraries(_libraryAddresses); m_compiler.setEVMVersion(m_evmVersion); m_compiler.setOptimiserSettings(m_optimiserSettings); diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp index 000a79381..faaf20da5 100644 --- a/test/libsolidity/SolidityNatspecJSON.cpp +++ b/test/libsolidity/SolidityNatspecJSON.cpp @@ -46,8 +46,8 @@ public: bool _userDocumentation ) { - m_compilerStack.reset(false); - m_compilerStack.addSource("", "pragma solidity >=0.0;\n" + _code); + m_compilerStack.reset(); + m_compilerStack.setSources({{"", "pragma solidity >=0.0;\n" + _code}}); m_compilerStack.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_REQUIRE_MESSAGE(m_compilerStack.parseAndAnalyze(), "Parsing contract failed"); @@ -67,8 +67,8 @@ public: void expectNatspecError(std::string const& _code) { - m_compilerStack.reset(false); - m_compilerStack.addSource("", "pragma solidity >=0.0;\n" + _code); + m_compilerStack.reset(); + m_compilerStack.setSources({{"", "pragma solidity >=0.0;\n" + _code}}); m_compilerStack.setEVMVersion(dev::test::Options::get().evmVersion()); BOOST_CHECK(!m_compilerStack.parseAndAnalyze()); BOOST_REQUIRE(Error::containsErrorOfType(m_compilerStack.errors(), Error::Type::DocstringParsingError)); diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp index d9900ab2b..6764545ad 100644 --- a/test/libsolidity/SyntaxTest.cpp +++ b/test/libsolidity/SyntaxTest.cpp @@ -67,7 +67,7 @@ bool SyntaxTest::run(ostream& _stream, string const& _linePrefix, bool _formatte { string const versionPragma = "pragma solidity >=0.0;\n"; m_compiler.reset(); - m_compiler.addSource("", versionPragma + m_source); + m_compiler.setSources({{"", versionPragma + m_source}}); m_compiler.setEVMVersion(m_evmVersion); if (m_compiler.parse())