Skip to content

Commit f05cbb9

Browse files
ekpyronekpyron
authored
Merge pull request #13524 from ethereum/remove-std-qualifier-from-metadata-tests
Remove std qualifier from string in Metadata tests
2 parents ea78c8f + 12ea115 commit f05cbb9

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎test/libsolidity/Metadata.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ map<string, string> requireParsedCBORMetadata(bytes const& _bytecode, CompilerSt
5454
optional<string> compileAndCheckLicenseMetadata(string const& _contractName, char const* _sourceCode)
5555
{
5656
CompilerStack compilerStack;
57-
compilerStack.setSources({{"A.sol", std::string(_sourceCode)}});
57+
compilerStack.setSources({{"A.sol", _sourceCode}});
5858
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
5959

60-
std::string const& serialisedMetadata = compilerStack.metadata(_contractName);
60+
string const& serialisedMetadata = compilerStack.metadata(_contractName);
6161
Json::Value metadata;
6262
BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
6363
BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -101,13 +101,13 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
101101
{
102102
CompilerStack compilerStack;
103103
compilerStack.setMetadataFormat(metadataFormat);
104-
compilerStack.setSources({{"", std::string(sourceCode)}});
104+
compilerStack.setSources({{"", sourceCode}});
105105
compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
106106
compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
107107
compilerStack.setMetadataHash(metadataHash);
108108
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
109109
bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
110-
std::string const& metadata = compilerStack.metadata("test");
110+
string const& metadata = compilerStack.metadata("test");
111111
BOOST_CHECK(solidity::test::isValidMetadata(metadata));
112112

113113
auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
@@ -174,13 +174,13 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
174174
{
175175
CompilerStack compilerStack;
176176
compilerStack.setMetadataFormat(metadataFormat);
177-
compilerStack.setSources({{"", std::string(sourceCode)}});
177+
compilerStack.setSources({{"", sourceCode}});
178178
compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
179179
compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
180180
compilerStack.setMetadataHash(metadataHash);
181181
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
182182
bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
183-
std::string const& metadata = compilerStack.metadata("test");
183+
string const& metadata = compilerStack.metadata("test");
184184
BOOST_CHECK(solidity::test::isValidMetadata(metadata));
185185

186186
auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
@@ -242,14 +242,14 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources)
242242
}
243243
)";
244244
compilerStack.setSources({
245-
{"A", std::string(sourceCodeA)},
246-
{"B", std::string(sourceCodeB)},
245+
{"A", sourceCodeA},
246+
{"B", sourceCodeB},
247247
});
248248
compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
249249
compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
250250
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
251251

252-
std::string const& serialisedMetadata = compilerStack.metadata("A");
252+
string const& serialisedMetadata = compilerStack.metadata("A");
253253
Json::Value metadata;
254254
BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
255255
BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -282,15 +282,15 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
282282
}
283283
)";
284284
compilerStack.setSources({
285-
{"A", std::string(sourceCodeA)},
286-
{"B", std::string(sourceCodeB)},
287-
{"C", std::string(sourceCodeC)}
285+
{"A", sourceCodeA},
286+
{"B", sourceCodeB},
287+
{"C", sourceCodeC}
288288
});
289289
compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
290290
compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
291291
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
292292

293-
std::string const& serialisedMetadata = compilerStack.metadata("C");
293+
string const& serialisedMetadata = compilerStack.metadata("C");
294294
Json::Value metadata;
295295
BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
296296
BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -313,7 +313,7 @@ BOOST_AUTO_TEST_CASE(metadata_useLiteralContent)
313313
auto check = [](char const* _src, bool _literal)
314314
{
315315
CompilerStack compilerStack;
316-
compilerStack.setSources({{"", std::string(_src)}});
316+
compilerStack.setSources({{"", _src}});
317317
compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
318318
compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
319319
compilerStack.useMetadataLiteralSources(_literal);
@@ -347,7 +347,7 @@ BOOST_AUTO_TEST_CASE(metadata_viair)
347347
auto check = [](char const* _src, bool _viaIR)
348348
{
349349
CompilerStack compilerStack;
350-
compilerStack.setSources({{"", std::string(_src)}});
350+
compilerStack.setSources({{"", _src}});
351351
compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
352352
compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
353353
compilerStack.setViaIR(_viaIR);
@@ -388,11 +388,11 @@ BOOST_AUTO_TEST_CASE(metadata_revert_strings)
388388
contract A {
389389
}
390390
)";
391-
compilerStack.setSources({{"A", std::string(sourceCodeA)}});
391+
compilerStack.setSources({{"A", sourceCodeA}});
392392
compilerStack.setRevertStringBehaviour(RevertStrings::Strip);
393393
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
394394

395-
std::string const& serialisedMetadata = compilerStack.metadata("A");
395+
string const& serialisedMetadata = compilerStack.metadata("A");
396396
Json::Value metadata;
397397
BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
398398
BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -424,13 +424,13 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
424424
optimizerSettings.yulOptimiserSteps = _optimizerSequence;
425425
optimizerSettings.yulOptimiserCleanupSteps = _optimizerCleanupSequence;
426426
CompilerStack compilerStack;
427-
compilerStack.setSources({{"", std::string(sourceCode)}});
427+
compilerStack.setSources({{"", sourceCode}});
428428
compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
429429
compilerStack.setOptimiserSettings(optimizerSettings);
430430

431431
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
432432

433-
std::string const& serialisedMetadata = compilerStack.metadata("C");
433+
string const& serialisedMetadata = compilerStack.metadata("C");
434434
Json::Value metadata;
435435
BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
436436
BOOST_CHECK(solidity::test::isValidMetadata(metadata));

0 commit comments

Comments
 (0)