diff options
author | chriseth <c@ethdev.com> | 2016-08-24 18:15:35 +0800 |
---|---|---|
committer | chriseth <c@ethdev.com> | 2016-09-01 06:03:01 +0800 |
commit | 459d2dd7cd599651752543d24b4ebc8a6a248931 (patch) | |
tree | 49cc873ebc340819d89851989a79d87a2c734916 | |
parent | d87450b9b2ba110b218c8f58224ca3af4e62993b (diff) | |
download | dexon-solidity-459d2dd7cd599651752543d24b4ebc8a6a248931.tar.gz dexon-solidity-459d2dd7cd599651752543d24b4ebc8a6a248931.tar.zst dexon-solidity-459d2dd7cd599651752543d24b4ebc8a6a248931.zip |
Fix version pragmas in tests.
-rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 2 | ||||
-rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 2 | ||||
-rw-r--r-- | test/contracts/Wallet.cpp | 2 | ||||
-rw-r--r-- | test/libsolidity/GasMeter.cpp | 2 | ||||
-rw-r--r-- | test/libsolidity/Imports.cpp | 74 | ||||
-rw-r--r-- | test/libsolidity/SolidityABIJSON.cpp | 2 | ||||
-rw-r--r-- | test/libsolidity/SolidityExecutionFramework.h | 2 | ||||
-rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 2 | ||||
-rw-r--r-- | test/libsolidity/SolidityNatspecJSON.cpp | 2 |
9 files changed, 45 insertions, 45 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index 1c47e70e..681caa26 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -39,7 +39,7 @@ namespace { static char const* registrarCode = R"DELIMITER( -pragma solidity ^0.3.6; +pragma solidity ^0.3.5; contract NameRegister { function addr(string _name) constant returns (address o_owner); diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index 0df26ee4..fd0861f7 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -52,7 +52,7 @@ static char const* registrarCode = R"DELIMITER( // @authors: // Gav Wood <g@ethdev.com> -pragma solidity ^0.3.6; +pragma solidity ^0.3.5; contract Registrar { event Changed(string indexed name); diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp index 70c35cc1..55c2e1af 100644 --- a/test/contracts/Wallet.cpp +++ b/test/contracts/Wallet.cpp @@ -55,7 +55,7 @@ static char const* walletCode = R"DELIMITER( // some number (specified in constructor) of the set of owners (specified in the constructor, modifiable) before the // interior is executed. -pragma solidity ^0.3.6; +pragma solidity ^0.3.5; contract multiowned { diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index 603ad683..1f216680 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -46,7 +46,7 @@ public: GasMeterTestFramework() { } void compile(string const& _sourceCode) { - m_compiler.setSource("pragma solidity >= 0;" + _sourceCode); + m_compiler.setSource("pragma solidity >= 0.0;" + _sourceCode); ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(), "Compiling contract failed"); AssemblyItems const* items = m_compiler.runtimeAssemblyItems(""); diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp index b88ab189..1a9e16cc 100644 --- a/test/libsolidity/Imports.cpp +++ b/test/libsolidity/Imports.cpp @@ -39,106 +39,106 @@ BOOST_AUTO_TEST_SUITE(SolidityImports) BOOST_AUTO_TEST_CASE(smoke_test) { CompilerStack c; - c.addSource("a", "contract C {} pragma solidity >= 0;"); + c.addSource("a", "contract C {} pragma solidity >=0.0;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(regular_import) { CompilerStack c; - c.addSource("a", "contract C {} pragma solidity >= 0;"); - c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >= 0;"); + c.addSource("a", "contract C {} pragma solidity >=0.0;"); + c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >=0.0;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(import_does_not_clutter_importee) { CompilerStack c; - c.addSource("a", "contract C { D d; } pragma solidity >= 0;"); - c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >= 0;"); + c.addSource("a", "contract C { D d; } pragma solidity >=0.0;"); + c.addSource("b", "import \"a\"; contract D is C {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); } BOOST_AUTO_TEST_CASE(import_is_transitive) { CompilerStack c; - c.addSource("a", "contract C { } pragma solidity >= 0;"); - c.addSource("b", "import \"a\"; pragma solidity >= 0;"); - c.addSource("c", "import \"b\"; contract D is C {} pragma solidity >= 0;"); + 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;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(circular_import) { CompilerStack c; - c.addSource("a", "import \"b\"; contract C { D d; } pragma solidity >= 0;"); - c.addSource("b", "import \"a\"; contract D { C c; } pragma solidity >= 0;"); + 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;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(relative_import) { CompilerStack c; - c.addSource("a", "import \"./dir/b\"; contract A is B {} pragma solidity >= 0;"); - c.addSource("dir/b", "contract B {} pragma solidity >= 0;"); - c.addSource("dir/c", "import \"../a\"; contract C is A {} pragma solidity >= 0;"); + 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;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(relative_import_multiplex) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >= 0;"); - c.addSource("dir/a/b/c", "import \"../../.././a\"; contract B is A {} pragma solidity >= 0;"); + 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;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(simple_alias) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >= 0;"); - c.addSource("dir/a/b/c", "import \"../../.././a\" as x; contract B is x.A { function() { x.A r = x.A(20); } } pragma solidity >= 0;"); + 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() { x.A r = x.A(20); } } pragma solidity >=0.0;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(library_name_clash) { CompilerStack c; - c.addSource("a", "library A {} pragma solidity >= 0;"); - c.addSource("b", "library A {} pragma solidity >= 0;"); + c.addSource("a", "library A {} pragma solidity >=0.0;"); + c.addSource("b", "library A {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); } BOOST_AUTO_TEST_CASE(library_name_clash_with_contract) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >= 0;"); - c.addSource("b", "library A {} pragma solidity >= 0;"); + c.addSource("a", "contract A {} pragma solidity >=0.0;"); + c.addSource("b", "library A {} pragma solidity >=0.0;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(complex_import) { CompilerStack c; - c.addSource("a", "contract A {} contract B {} contract C { struct S { uint a; } } pragma solidity >= 0;"); + 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 var1, x.C.S var2, C.S var3) internal {} } pragma solidity >= 0;"); + "contract D is b { function f(c.S var1, x.C.S var2, C.S var3) internal {} } pragma solidity >=0.0;"); BOOST_CHECK(c.compile()); } BOOST_AUTO_TEST_CASE(name_clash_in_import) { CompilerStack c; - c.addSource("a", "contract A {} pragma solidity >= 0;"); - c.addSource("b", "import \"a\"; contract A {} pragma solidity >= 0;"); + c.addSource("a", "contract A {} pragma solidity >=0.0;"); + c.addSource("b", "import \"a\"; contract A {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); - c.addSource("b", "import \"a\" as A; contract A {} pragma solidity >= 0;"); + c.addSource("b", "import \"a\" as A; contract A {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); - c.addSource("b", "import {A as b} from \"a\"; contract b {} pragma solidity >= 0;"); + c.addSource("b", "import {A as b} from \"a\"; contract b {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); - c.addSource("b", "import {A} from \"a\"; contract A {} pragma solidity >= 0;"); + c.addSource("b", "import {A} from \"a\"; contract A {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); - c.addSource("b", "import {A} from \"a\"; contract B {} pragma solidity >= 0;"); + c.addSource("b", "import {A} from \"a\"; contract B {} pragma solidity >=0.0;"); BOOST_CHECK(c.compile()); } @@ -146,10 +146,10 @@ BOOST_AUTO_TEST_CASE(remappings) { CompilerStack c; c.setRemappings(vector<string>{"s=s_1.4.6", "t=Tee"}); - c.addSource("a", "import \"s/s.sol\"; contract A is S {} pragma solidity >= 0;"); - c.addSource("b", "import \"t/tee.sol\"; contract A is Tee {} pragma solidity >= 0;"); - c.addSource("s_1.4.6/s.sol", "contract S {} pragma solidity >= 0;"); - c.addSource("Tee/tee.sol", "contract Tee {} pragma solidity >= 0;"); + 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;"); BOOST_CHECK(c.compile()); } @@ -157,10 +157,10 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings) { CompilerStack c; c.setRemappings(vector<string>{"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;"); - c.addSource("b/b.sol", "import \"s/s.sol\"; contract B is SSeven {} pragma solidity >= 0;"); - c.addSource("s_1.4.6/s.sol", "contract SSix {} pragma solidity >= 0;"); - c.addSource("s_1.4.7/s.sol", "contract SSeven {} pragma solidity >= 0;"); + 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;"); BOOST_CHECK(c.compile()); } diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index 6bcc7b3c..ec621104 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -39,7 +39,7 @@ public: void checkInterface(std::string const& _code, std::string const& _expectedInterfaceString) { - ETH_TEST_REQUIRE_NO_THROW(m_compilerStack.parse("pragma solidity >=0;\n" + _code), "Parsing contract failed"); + ETH_TEST_REQUIRE_NO_THROW(m_compilerStack.parse("pragma solidity >=0.0;\n" + _code), "Parsing contract failed"); std::string generatedInterfaceString = m_compilerStack.metadata("", DocumentationType::ABIInterface); Json::Value generatedInterface; m_reader.parse(generatedInterfaceString, generatedInterface); diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index 33347600..6cf7e0ee 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -68,7 +68,7 @@ public: ) { // Silence compiler version warning - std::string sourceCode = "pragma solidity >=0;\n" + _sourceCode; + std::string sourceCode = "pragma solidity >=0.0;\n" + _sourceCode; m_compiler.reset(false); m_compiler.addSource("", sourceCode); if (!m_compiler.compile(m_optimize, m_optimizeRuns)) diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 5f29bf89..2c126b65 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -48,7 +48,7 @@ pair<ASTPointer<SourceUnit>, std::shared_ptr<Error::Type const>> parseAnalyseAndReturnError(string const& _source, bool _reportWarnings = false, bool _insertVersionPragma = true) { // Silence compiler version warning - string source = _insertVersionPragma ? "pragma solidity >=0;\n" + _source : _source; + string source = _insertVersionPragma ? "pragma solidity >=0.0;\n" + _source : _source; ErrorList errors; Parser parser(errors); ASTPointer<SourceUnit> sourceUnit; diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp index 4071e973..1f74e928 100644 --- a/test/libsolidity/SolidityNatspecJSON.cpp +++ b/test/libsolidity/SolidityNatspecJSON.cpp @@ -46,7 +46,7 @@ public: ) { std::string generatedDocumentationString; - ETH_TEST_REQUIRE_NO_THROW(m_compilerStack.parse("pragma solidity >=0;\n" + _code), "Parsing failed"); + ETH_TEST_REQUIRE_NO_THROW(m_compilerStack.parse("pragma solidity >=0.0;\n" + _code), "Parsing failed"); if (_userDocumentation) generatedDocumentationString = m_compilerStack.metadata("", DocumentationType::NatspecUser); |