Skip to content

Commit 510765b

Browse files
cameelcameel
committed
Remove unnecessary namespace prefixes, some aliases and unused imports from a few test casees
1 parent 4c4860b commit 510765b

20 files changed

+108
-110
lines changed

‎libevmasm/Assembly.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
#include <range/v3/view/enumerate.hpp>
4444
#include <range/v3/view/map.hpp>
4545

46-
#include <fstream>
4746
#include <limits>
4847
#include <iterator>
48+
#include <ostream>
4949
#include <stack>
5050

5151
using namespace solidity;

‎test/Common.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void CommonOptions::addOptions()
113113
("evm-version", po::value(&evmVersionString), "which EVM version to use")
114114
// "eof-version" is declared as uint64_t, since uint8_t will be parsed as character by boost.
115115
("eof-version", po::value<uint64_t>()->implicit_value(1u), "which EOF version to use")
116-
("testpath", po::value<fs::path>(&this->testPath)->default_value(solidity::test::testPath()), "path to test files")
116+
("testpath", po::value<fs::path>(&this->testPath)->default_value(test::testPath()), "path to test files")
117117
("vm", po::value<std::vector<fs::path>>(&vmPaths), "path to evmc library, can be supplied multiple times.")
118118
("batches", po::value<size_t>(&this->batches)->default_value(1), "set number of batches to split the tests into")
119119
("selected-batch", po::value<size_t>(&this->selectedBatch)->default_value(0), "zero-based number of batch to execute")
@@ -309,14 +309,14 @@ bool isValidSemanticTestPath(boost::filesystem::path const& _testPath)
309309
boost::unit_test::precondition::predicate_t nonEOF()
310310
{
311311
return [](boost::unit_test::test_unit_id) {
312-
return !solidity::test::CommonOptions::get().eofVersion().has_value();
312+
return !CommonOptions::get().eofVersion().has_value();
313313
};
314314
}
315315

316316
boost::unit_test::precondition::predicate_t onEOF()
317317
{
318318
return [](boost::unit_test::test_unit_id) {
319-
return solidity::test::CommonOptions::get().eofVersion().has_value();
319+
return CommonOptions::get().eofVersion().has_value();
320320
};
321321
}
322322

@@ -332,13 +332,13 @@ bool loadVMs(CommonOptions const& _options)
332332
if (_options.disableSemanticTests)
333333
return true;
334334

335-
bool evmSupported = solidity::test::EVMHost::checkVmPaths(_options.vmPaths);
335+
bool evmSupported = EVMHost::checkVmPaths(_options.vmPaths);
336336
if (!_options.disableSemanticTests && !evmSupported)
337337
{
338-
std::cerr << "Unable to find " << solidity::test::evmoneFilename;
338+
std::cerr << "Unable to find " << evmoneFilename;
339339
std::cerr << ". Please disable semantics tests with --no-semantic-tests or provide a path using --vm <path>." << std::endl;
340340
std::cerr << "You can download it at" << std::endl;
341-
std::cerr << solidity::test::evmoneDownloadLink << std::endl;
341+
std::cerr << evmoneDownloadLink << std::endl;
342342
return false;
343343
}
344344
return true;

‎test/CommonSyntaxTest.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include <boost/test/unit_test.hpp>
3131
#include <boost/throw_exception.hpp>
3232

33-
#include <fstream>
34-
#include <memory>
33+
#include <istream>
34+
#include <ostream>
3535
#include <stdexcept>
3636

3737
using namespace solidity;
@@ -42,7 +42,6 @@ using namespace solidity::frontend;
4242
using namespace solidity::frontend::test;
4343
using namespace solidity::test;
4444
using namespace boost::unit_test;
45-
namespace fs = boost::filesystem;
4645

4746
namespace
4847
{

‎test/CommonSyntaxTest.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <iosfwd>
2828
#include <string>
2929
#include <vector>
30-
#include <utility>
3130

3231
namespace solidity::test
3332
{

‎test/ExecutionFramework.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
#include <libsolutil/FunctionSelector.h>
3535
#include <libsolutil/ErrorCodes.h>
3636

37-
#include <functional>
38-
3937
#include <boost/rational.hpp>
4038
#include <boost/test/unit_test.hpp>
4139

‎test/InteractiveTests.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@
1919
#pragma once
2020

2121
#include <test/TestCase.h>
22+
2223
#include <test/libsolidity/ABIJsonTest.h>
2324
#include <test/libsolidity/ASTJSONTest.h>
2425
#include <test/libsolidity/ASTPropertyTest.h>
25-
#include <libsolidity/FunctionDependencyGraphTest.h>
2626
#include <test/libsolidity/GasTest.h>
2727
#include <test/libsolidity/MemoryGuardTest.h>
2828
#include <test/libsolidity/NatspecJSONTest.h>
2929
#include <test/libsolidity/OptimizedIRCachingTest.h>
3030
#include <test/libsolidity/SyntaxTest.h>
3131
#include <test/libsolidity/SemanticTest.h>
3232
#include <test/libsolidity/SMTCheckerTest.h>
33+
3334
#include <test/libyul/ControlFlowGraphTest.h>
3435
#include <test/libyul/SSAControlFlowGraphTest.h>
3536
#include <test/libyul/EVMCodeTransformTest.h>
@@ -44,6 +45,8 @@
4445

4546
#include <test/libevmasm/EVMAssemblyTest.h>
4647

48+
#include <libsolidity/FunctionDependencyGraphTest.h>
49+
4750
#include <boost/filesystem.hpp>
4851

4952
namespace solidity::frontend::test

‎test/TestCase.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ using namespace solidity;
3131
using namespace solidity::frontend;
3232
using namespace solidity::frontend::test;
3333
using namespace solidity::util;
34+
using namespace solidity::test;
3435

3536
void TestCase::printSettings(std::ostream& _stream, const std::string& _linePrefix, const bool)
3637
{
@@ -123,7 +124,7 @@ void EVMVersionRestrictedTestCase::processEVMVersionSetting()
123124
if (!version)
124125
BOOST_THROW_EXCEPTION(std::runtime_error{"Invalid EVM version: \"" + versionString + "\""});
125126

126-
langutil::EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
127+
langutil::EVMVersion evmVersion = CommonOptions::get().evmVersion();
127128
bool comparisonResult;
128129
if (comparator == ">")
129130
comparisonResult = evmVersion > version;
@@ -146,9 +147,9 @@ void EVMVersionRestrictedTestCase::processEVMVersionSetting()
146147

147148
void EVMVersionRestrictedTestCase::processBytecodeFormatSetting()
148149
{
149-
std::optional<uint8_t> eofVersion = solidity::test::CommonOptions::get().eofVersion();
150+
std::optional<uint8_t> eofVersion = CommonOptions::get().eofVersion();
150151
// EOF only available since Osaka
151-
solAssert(!eofVersion.has_value() || solidity::test::CommonOptions::get().evmVersion().supportsEOF());
152+
solAssert(!eofVersion.has_value() || CommonOptions::get().evmVersion().supportsEOF());
152153

153154
std::string bytecodeFormatString = m_reader.stringSetting("bytecodeFormat", "legacy,>=EOFv1");
154155
if (bytecodeFormatString == "legacy,>=EOFv1" || bytecodeFormatString == ">=EOFv1,legacy")

‎test/libevmasm/Optimiser.cpp

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <range/v3/algorithm/any_of.hpp>
3737

3838
#include <string>
39-
#include <tuple>
4039
#include <memory>
4140

4241
using namespace solidity::langutil;
@@ -319,7 +318,7 @@ BOOST_AUTO_TEST_CASE(cse_associativity2)
319318

320319
BOOST_AUTO_TEST_CASE(cse_double_shift_right_overflow)
321320
{
322-
if (solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
321+
if (CommonOptions::get().evmVersion().hasBitwiseShifting())
323322
{
324323
AssemblyItems input{
325324
Instruction::CALLVALUE,
@@ -334,7 +333,7 @@ BOOST_AUTO_TEST_CASE(cse_double_shift_right_overflow)
334333

335334
BOOST_AUTO_TEST_CASE(cse_double_shift_left_overflow)
336335
{
337-
if (solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
336+
if (CommonOptions::get().evmVersion().hasBitwiseShifting())
338337
{
339338
AssemblyItems input{
340339
Instruction::DUP1,
@@ -1001,7 +1000,7 @@ BOOST_AUTO_TEST_CASE(clear_unreachable_code)
10011000
AssemblyItem(PushTag, 1),
10021001
Instruction::JUMP
10031002
};
1004-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1003+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
10051004
BOOST_REQUIRE(peepOpt.optimise());
10061005
BOOST_CHECK_EQUAL_COLLECTIONS(
10071006
items.begin(), items.end(),
@@ -1040,7 +1039,7 @@ BOOST_AUTO_TEST_CASE(clear_unreachable_code_eof, *boost::unit_test::precondition
10401039
Instruction::SSTORE,
10411040
blockTerminatingItem,
10421041
};
1043-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1042+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
10441043
BOOST_REQUIRE(peepOpt.optimise());
10451044
BOOST_CHECK_EQUAL_COLLECTIONS(
10461045
items.begin(), items.end(),
@@ -1069,7 +1068,7 @@ BOOST_AUTO_TEST_CASE(is_zero_is_zero_rjumpi, *boost::unit_test::precondition(onE
10691068
AssemblyItem(Tag, 1),
10701069
};
10711070

1072-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1071+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
10731072
BOOST_REQUIRE(peepOpt.optimise());
10741073
BOOST_CHECK_EQUAL_COLLECTIONS(
10751074
items.begin(), items.end(),
@@ -1100,7 +1099,7 @@ BOOST_AUTO_TEST_CASE(equal_is_zero_rjumpi, *boost::unit_test::precondition(onEOF
11001099
AssemblyItem(Tag, 1),
11011100
};
11021101

1103-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1102+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
11041103
BOOST_REQUIRE(peepOpt.optimise());
11051104
BOOST_CHECK_EQUAL_COLLECTIONS(
11061105
items.begin(), items.end(),
@@ -1130,7 +1129,7 @@ BOOST_AUTO_TEST_CASE(double_rjump, *boost::unit_test::precondition(onEOF()))
11301129
AssemblyItem(Tag, 2),
11311130
};
11321131

1133-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1132+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
11341133
BOOST_REQUIRE(peepOpt.optimise());
11351134
BOOST_CHECK_EQUAL_COLLECTIONS(
11361135
items.begin(), items.end(),
@@ -1153,7 +1152,7 @@ BOOST_AUTO_TEST_CASE(rjump_to_next, *boost::unit_test::precondition(onEOF()))
11531152
Instruction::SLOAD,
11541153
};
11551154

1156-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1155+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
11571156
BOOST_REQUIRE(peepOpt.optimise());
11581157
BOOST_CHECK_EQUAL_COLLECTIONS(
11591158
items.begin(), items.end(),
@@ -1177,7 +1176,7 @@ BOOST_AUTO_TEST_CASE(rjumpi_to_next, *boost::unit_test::precondition(onEOF()))
11771176
Instruction::SLOAD,
11781177
};
11791178

1180-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1179+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
11811180
BOOST_REQUIRE(peepOpt.optimise());
11821181
BOOST_CHECK_EQUAL_COLLECTIONS(
11831182
items.begin(), items.end(),
@@ -1205,7 +1204,7 @@ BOOST_AUTO_TEST_CASE(deduplicateNextTagBlockSize3)
12051204
u256(1),
12061205
Instruction::REVERT
12071206
};
1208-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1207+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
12091208
BOOST_REQUIRE(peepOpt.optimise());
12101209
BOOST_CHECK_EQUAL_COLLECTIONS(
12111210
items.begin(), items.end(),
@@ -1230,7 +1229,7 @@ BOOST_AUTO_TEST_CASE(deduplicateNextTagBlockSize2)
12301229
u256(0),
12311230
Instruction::SELFDESTRUCT
12321231
};
1233-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1232+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
12341233
BOOST_REQUIRE(peepOpt.optimise());
12351234
BOOST_CHECK_EQUAL_COLLECTIONS(
12361235
items.begin(), items.end(),
@@ -1252,7 +1251,7 @@ BOOST_AUTO_TEST_CASE(deduplicateNextTagBlockSize1)
12521251
AssemblyItem(Tag, 2),
12531252
Instruction::STOP
12541253
};
1255-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1254+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
12561255
BOOST_REQUIRE(peepOpt.optimise());
12571256
BOOST_CHECK_EQUAL_COLLECTIONS(
12581257
items.begin(), items.end(),
@@ -1280,7 +1279,7 @@ BOOST_AUTO_TEST_CASE(peephole_double_push)
12801279
};
12811280

12821281
// `PUSH0 PUSH0` is cheaper than `DUP1 PUSH0`
1283-
if (solidity::test::CommonOptions::get().evmVersion() >= EVMVersion::shanghai())
1282+
if (CommonOptions::get().evmVersion() >= EVMVersion::shanghai())
12841283
expectation = {
12851284
u256(0),
12861285
u256(0),
@@ -1290,7 +1289,7 @@ BOOST_AUTO_TEST_CASE(peephole_double_push)
12901289
u256(5)
12911290
};
12921291

1293-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1292+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
12941293
BOOST_REQUIRE(peepOpt.optimise());
12951294
BOOST_CHECK_EQUAL_COLLECTIONS(
12961295
items.begin(), items.end(),
@@ -1306,7 +1305,7 @@ BOOST_AUTO_TEST_CASE(peephole_pop_calldatasize)
13061305
Instruction::LT,
13071306
Instruction::POP
13081307
};
1309-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1308+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
13101309
for (size_t i = 0; i < 3; i++)
13111310
BOOST_CHECK(peepOpt.optimise());
13121311
BOOST_CHECK(items.empty());
@@ -1339,7 +1338,7 @@ BOOST_AUTO_TEST_CASE(peephole_commutative_swap1)
13391338
u256(4),
13401339
u256(5)
13411340
};
1342-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1341+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
13431342
BOOST_REQUIRE(peepOpt.optimise());
13441343
BOOST_CHECK_EQUAL_COLLECTIONS(
13451344
items.begin(), items.end(),
@@ -1377,7 +1376,7 @@ BOOST_AUTO_TEST_CASE(peephole_noncommutative_swap1)
13771376
u256(4),
13781377
u256(5)
13791378
};
1380-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1379+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
13811380
BOOST_REQUIRE(!peepOpt.optimise());
13821381
BOOST_CHECK_EQUAL_COLLECTIONS(
13831382
items.begin(), items.end(),
@@ -1412,7 +1411,7 @@ BOOST_AUTO_TEST_CASE(peephole_swap_comparison)
14121411
u256(4),
14131412
u256(5)
14141413
};
1415-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1414+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
14161415
BOOST_REQUIRE(peepOpt.optimise());
14171416
BOOST_CHECK_EQUAL_COLLECTIONS(
14181417
items.begin(), items.end(),
@@ -1438,7 +1437,7 @@ BOOST_AUTO_TEST_CASE(peephole_truthy_and)
14381437
AssemblyItem(PushTag, 1),
14391438
Instruction::JUMPI
14401439
};
1441-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1440+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
14421441
BOOST_REQUIRE(peepOpt.optimise());
14431442
BOOST_CHECK_EQUAL_COLLECTIONS(
14441443
items.begin(), items.end(),
@@ -1471,7 +1470,7 @@ BOOST_AUTO_TEST_CASE(peephole_iszero_iszero_jumpi)
14711470
u256(0x20),
14721471
Instruction::RETURN
14731472
};
1474-
PeepholeOptimiser peepOpt(items, solidity::test::CommonOptions::get().evmVersion());
1473+
PeepholeOptimiser peepOpt(items, CommonOptions::get().evmVersion());
14751474
BOOST_REQUIRE(peepOpt.optimise());
14761475
BOOST_CHECK_EQUAL_COLLECTIONS(
14771476
items.begin(), items.end(),
@@ -1513,7 +1512,7 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies, *boost::unit_test::precondi
15131512
// tag unifications (due to block deduplication) is also
15141513
// visible at the super-assembly.
15151514

1516-
solAssert(!solidity::test::CommonOptions::get().eofVersion().has_value());
1515+
solAssert(!CommonOptions::get().eofVersion().has_value());
15171516
Assembly::OptimiserSettings settings;
15181517
settings.runInliner = false;
15191518
settings.runJumpdestRemover = true;
@@ -1728,7 +1727,7 @@ BOOST_AUTO_TEST_CASE(verbatim_knownstate)
17281727

17291728
BOOST_AUTO_TEST_CASE(cse_remove_redundant_shift_masking)
17301729
{
1731-
if (!solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
1730+
if (!CommonOptions::get().evmVersion().hasBitwiseShifting())
17321731
return;
17331732

17341733
for (unsigned i = 1; i < 256; i++)
@@ -1876,7 +1875,7 @@ BOOST_AUTO_TEST_CASE(cse_remove_unwanted_masking_of_address)
18761875

18771876
BOOST_AUTO_TEST_CASE(cse_replace_too_large_shift)
18781877
{
1879-
if (!solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting())
1878+
if (!CommonOptions::get().evmVersion().hasBitwiseShifting())
18801879
return;
18811880

18821881
checkCSE({

‎test/libsolidity/ABIJsonTest.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@
2626
#include <libsolutil/JSON.h>
2727
#include <libsolutil/AnsiColorized.h>
2828

29-
#include <fstream>
29+
#include <ostream>
30+
#include <string>
3031

3132
using namespace solidity;
3233
using namespace solidity::util;
3334
using namespace solidity::frontend;
3435
using namespace solidity::frontend::test;
36+
using namespace solidity::test;
3537

3638
ABIJsonTest::ABIJsonTest(std::string const& _filename):
3739
TestCase(_filename)
@@ -48,8 +50,8 @@ TestCase::TestResult ABIJsonTest::run(std::ostream& _stream, std::string const&
4850
"",
4951
"pragma solidity >=0.0;\n// SPDX-License-Identifier: GPL-3.0\n" + m_source
5052
}});
51-
compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
52-
compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
53+
compiler.setEVMVersion(CommonOptions::get().evmVersion());
54+
compiler.setOptimiserSettings(CommonOptions::get().optimize);
5355
if (!compiler.parseAndAnalyze())
5456
BOOST_THROW_EXCEPTION(std::runtime_error("Parsing contract failed"));
5557

0 commit comments

Comments
 (0)