Merge pull request #6603

4e2377995 Change ZMQ-JSON txextra to hex and remove unnecessary base fields (Lee Clagett)
This commit is contained in:
Alexander Blair 2020-08-16 12:43:38 -07:00
commit a08df6eb1b
No known key found for this signature in database
GPG key ID: C64552D877C32479
5 changed files with 48 additions and 6 deletions

View file

@ -97,7 +97,7 @@ namespace
rapidjson::Document doc;
doc.Parse(reinterpret_cast<const char*>(buffer.data()), buffer.size());
if (doc.HasParseError() || !doc.IsObject())
if (doc.HasParseError())
{
throw cryptonote::json::PARSE_FAIL();
}
@ -108,6 +108,21 @@ namespace
}
} // anonymous
TEST(JsonSerialization, VectorBytes)
{
EXPECT_EQ(std::vector<std::uint8_t>{}, test_json(std::vector<std::uint8_t>{}));
EXPECT_EQ(std::vector<std::uint8_t>{0x00}, test_json(std::vector<std::uint8_t>{0x00}));
}
TEST(JsonSerialization, InvalidVectorBytes)
{
rapidjson::Document doc;
doc.SetString("1");
std::vector<std::uint8_t> out;
EXPECT_THROW(cryptonote::json::fromJsonValue(doc, out), cryptonote::json::BAD_INPUT);
}
TEST(JsonSerialization, MinerTransaction)
{
cryptonote::account_base acct;