Use CBOR parser in metadata tests

This commit is contained in:
Alex Beregszaszi 2019-03-05 01:10:46 +01:00
parent 61220eb3e0
commit 67c15a208d

View File

@ -25,6 +25,8 @@
#include <libdevcore/SwarmHash.h> #include <libdevcore/SwarmHash.h>
#include <libdevcore/JSON.h> #include <libdevcore/JSON.h>
using namespace std;
namespace dev namespace dev
{ {
namespace solidity namespace solidity
@ -32,6 +34,18 @@ namespace solidity
namespace test namespace test
{ {
namespace
{
map<string, string> requireParsedCBORMetadata(bytes const& _bytecode)
{
bytes cborMetadata = dev::test::onlyMetadata(_bytecode);
BOOST_REQUIRE(!cborMetadata.empty());
boost::optional<map<string, string>> tmp = dev::test::parseCBORMetadata(cborMetadata);
BOOST_REQUIRE(tmp);
return *tmp;
}
}
BOOST_AUTO_TEST_SUITE(Metadata) BOOST_AUTO_TEST_SUITE(Metadata)
BOOST_AUTO_TEST_CASE(metadata_stamp) BOOST_AUTO_TEST_CASE(metadata_stamp)
@ -54,10 +68,10 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
BOOST_CHECK(dev::test::isValidMetadata(metadata)); BOOST_CHECK(dev::test::isValidMetadata(metadata));
bytes hash = dev::swarmHash(metadata).asBytes(); bytes hash = dev::swarmHash(metadata).asBytes();
BOOST_REQUIRE(hash.size() == 32); BOOST_REQUIRE(hash.size() == 32);
bytes cborMetadata = dev::test::onlyMetadata(bytecode); auto const cborMetadata = requireParsedCBORMetadata(bytecode);
BOOST_REQUIRE(!cborMetadata.empty()); BOOST_CHECK(cborMetadata.size() == 1);
bytes expectation = bytes{0xa1, 0x65, 'b', 'z', 'z', 'r', '0', 0x58, 0x20} + hash; BOOST_CHECK(cborMetadata.count("bzzr0") == 1);
BOOST_CHECK(std::equal(expectation.begin(), expectation.end(), cborMetadata.begin())); BOOST_CHECK(cborMetadata.at("bzzr0") == toHex(hash));
} }
BOOST_AUTO_TEST_CASE(metadata_stamp_experimental) BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
@ -80,13 +94,12 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
BOOST_CHECK(dev::test::isValidMetadata(metadata)); BOOST_CHECK(dev::test::isValidMetadata(metadata));
bytes hash = dev::swarmHash(metadata).asBytes(); bytes hash = dev::swarmHash(metadata).asBytes();
BOOST_REQUIRE(hash.size() == 32); BOOST_REQUIRE(hash.size() == 32);
bytes cborMetadata = dev::test::onlyMetadata(bytecode); auto const cborMetadata = requireParsedCBORMetadata(bytecode);
BOOST_REQUIRE(!cborMetadata.empty()); BOOST_CHECK(cborMetadata.size() == 2);
bytes expectation = BOOST_CHECK(cborMetadata.count("bzzr0") == 1);
bytes{0xa2, 0x65, 'b', 'z', 'z', 'r', '0', 0x58, 0x20} + BOOST_CHECK(cborMetadata.at("bzzr0") == toHex(hash));
hash + BOOST_CHECK(cborMetadata.count("experimental") == 1);
bytes{0x6c, 'e', 'x', 'p', 'e', 'r', 'i', 'm', 'e', 'n', 't', 'a', 'l', 0xf5}; BOOST_CHECK(cborMetadata.at("experimental") == "true");
BOOST_CHECK(std::equal(expectation.begin(), expectation.end(), cborMetadata.begin()));
} }
BOOST_AUTO_TEST_CASE(metadata_relevant_sources) BOOST_AUTO_TEST_CASE(metadata_relevant_sources)