From 220ccfb492511eab5a45936e477e6882f52be96a Mon Sep 17 00:00:00 2001 From: Rhett Aultman Date: Mon, 12 Dec 2016 00:00:50 -0800 Subject: Move clashing libraries to common source in test Since contracts and libraries only collide if they share a common source file now, this test only works if both libraries are in the same source. --- test/libsolidity/Imports.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/libsolidity/Imports.cpp') diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp index 56895fdc..e01d2e90 100644 --- a/test/libsolidity/Imports.cpp +++ b/test/libsolidity/Imports.cpp @@ -104,8 +104,7 @@ 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("a", "library A {} library A {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); } -- cgit v1.2.3 From a7f8a1986a9b3997c75cfc84235e567d2fa9aab4 Mon Sep 17 00:00:00 2001 From: Rhett Aultman Date: Wed, 21 Dec 2016 11:45:34 -0800 Subject: Revert "Move clashing libraries to common source in test" This reverts commit c4a9ca5cfe7a8b4ba9d2d84392c57d5eefacd1f7. --- test/libsolidity/Imports.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/libsolidity/Imports.cpp') diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp index e01d2e90..56895fdc 100644 --- a/test/libsolidity/Imports.cpp +++ b/test/libsolidity/Imports.cpp @@ -104,7 +104,8 @@ BOOST_AUTO_TEST_CASE(simple_alias) BOOST_AUTO_TEST_CASE(library_name_clash) { CompilerStack c; - c.addSource("a", "library A {} library A {} pragma solidity >=0.0;"); + c.addSource("a", "library A {} pragma solidity >=0.0;"); + c.addSource("b", "library A {} pragma solidity >=0.0;"); BOOST_CHECK(!c.compile()); } -- cgit v1.2.3 From fda39afdba9591131aac6d647cb46247e9495606 Mon Sep 17 00:00:00 2001 From: Rhett Aultman Date: Thu, 22 Dec 2016 08:30:53 -0800 Subject: Modify library collision test Since libaraies no longer collide on name but on fully-qualified name, you can only induce collision by colliding them as idenfitiers. --- test/libsolidity/Imports.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'test/libsolidity/Imports.cpp') diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp index 56895fdc..6aa96fb8 100644 --- a/test/libsolidity/Imports.cpp +++ b/test/libsolidity/Imports.cpp @@ -106,6 +106,7 @@ 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\";"); BOOST_CHECK(!c.compile()); } -- cgit v1.2.3