Merge pull request #6408 from ethereum/includeCleanup

Include cleanup

test/liblll/EndToEndTest.cpp

@@ -29,6 +29,7 @@
 #include <memory>
 
 using namespace std;
+using namespace dev::test;
 
 namespace dev
 {

test/liblll/ExecutionFramework.h

@@ -22,13 +22,12 @@
 
 #pragma once
 
-#include <functional>
 
-#include "../ExecutionFramework.h"
+#include <test/ExecutionFramework.h>
 
 #include <liblll/Compiler.h>
 
-using namespace dev::test;
+#include <functional>
 
 namespace dev
 {
@@ -38,9 +37,8 @@ namespace lll
 namespace test
 {
 
-class LLLExecutionFramework: public ExecutionFramework
+class LLLExecutionFramework: public dev::test::ExecutionFramework
 {
-
 public:
 	LLLExecutionFramework();
 
@@ -49,7 +47,7 @@ public:
 		u256 const& _value = 0,
 		std::string const& _contractName = "",
 		bytes const& _arguments = bytes(),
-		std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
+		std::map<std::string, dev::test::Address> const& _libraryAddresses = {}
 	) override
 	{
 		BOOST_REQUIRE(_contractName.empty());

test/liblll/LLL_ENS.cpp

@@ -29,6 +29,7 @@
 
 using namespace std;
 using namespace dev::lll;
+using namespace dev::test;
 
 namespace dev
 {

test/liblll/LLL_ERC20.cpp

@@ -34,6 +34,7 @@
 
 using namespace std;
 using namespace dev::lll;
+using namespace dev::test;
 
 namespace dev
 {