diff options
| -rw-r--r-- | test/ExecutionFramework.cpp | 3 | ||||
| -rw-r--r-- | test/ExecutionFramework.h | 6 | ||||
| -rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 1 | ||||
| -rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 1 | ||||
| -rw-r--r-- | test/contracts/Wallet.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/GasMeter.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExecutionFramework.cpp | 3 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExecutionFramework.h | 4 | ||||
| -rw-r--r-- | test/libsolidity/SolidityOptimizer.cpp | 1 |
10 files changed, 11 insertions, 11 deletions
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp index 4ae50462..0c6e0cff 100644 --- a/test/ExecutionFramework.cpp +++ b/test/ExecutionFramework.cpp @@ -27,8 +27,7 @@ using namespace std; using namespace dev; -using namespace dev::solidity; -using namespace dev::solidity::test; +using namespace dev::test; namespace // anonymous { diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h index e487b106..6ec1a06b 100644 --- a/test/ExecutionFramework.h +++ b/test/ExecutionFramework.h @@ -32,7 +32,7 @@ namespace dev { -namespace solidity +namespace test { using rational = boost::rational<dev::bigint>; /// An Ethereum address: 20 bytes. @@ -46,9 +46,6 @@ namespace solidity static const u256 shannon = exp10<9>(); static const u256 wei = exp10<0>(); -namespace test -{ - class ExecutionFramework { @@ -283,6 +280,5 @@ protected: }; } -} } // end namespaces diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index c156efd1..fb8c1c68 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -27,6 +27,7 @@ #include <test/libsolidity/SolidityExecutionFramework.h> using namespace std; +using namespace dev::test; namespace dev { diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index 829205d5..39c32eb7 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -35,6 +35,7 @@ #include <test/libsolidity/SolidityExecutionFramework.h> using namespace std; +using namespace dev::test; namespace dev { diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp index 6fbee6f1..80f06613 100644 --- a/test/contracts/Wallet.cpp +++ b/test/contracts/Wallet.cpp @@ -35,6 +35,7 @@ #include <test/libsolidity/SolidityExecutionFramework.h> using namespace std; +using namespace dev::test; namespace dev { diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index f467d669..0671fb15 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -32,6 +32,7 @@ using namespace std; using namespace dev::eth; using namespace dev::solidity; +using namespace dev::test; namespace dev { diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index b5fcdb5e..930b11c6 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -31,6 +31,7 @@ using namespace std; using namespace std::placeholders; +using namespace dev::test; namespace dev { diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp index fe35087c..bb9695d1 100644 --- a/test/libsolidity/SolidityExecutionFramework.cpp +++ b/test/libsolidity/SolidityExecutionFramework.cpp @@ -24,8 +24,7 @@ #include <boost/test/framework.hpp> #include <test/libsolidity/SolidityExecutionFramework.h> -using namespace std; -using namespace dev; +using namespace dev::test; using namespace dev::solidity; using namespace dev::solidity::test; diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index 16b886f1..0fab7aeb 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -38,7 +38,7 @@ namespace solidity namespace test { -class SolidityExecutionFramework: public ExecutionFramework +class SolidityExecutionFramework: public dev::test::ExecutionFramework { public: @@ -49,7 +49,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 = std::map<std::string, dev::test::Address>() ) override { // Silence compiler version warning diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp index 15208b41..60310555 100644 --- a/test/libsolidity/SolidityOptimizer.cpp +++ b/test/libsolidity/SolidityOptimizer.cpp @@ -37,6 +37,7 @@ using namespace std; using namespace dev::eth; +using namespace dev::test; namespace dev { |