Manually iterate over UniValue arrays in tests

This commit is contained in:
Jack Grigg
2017-01-07 10:11:31 +01:00
parent 0d37ae3a59
commit 5fb326d41d
3 changed files with 12 additions and 18 deletions

View File

@@ -630,14 +630,13 @@ TEST(proofs, g2_deserialization)
TEST(proofs, g1_test_vectors)
{
UniValue v = read_json(std::string(json_tests::g1_compressed, json_tests::g1_compressed + sizeof(json_tests::g1_compressed)));
std::vector<UniValue>::iterator v_iterator = v.getValues().begin();
curve_G1 e = curve_Fr("34958239045823") * curve_G1::one();
for (size_t i = 0; i < 10000; i++) {
e = (curve_Fr("34958239045823") ^ i) * e;
auto expected = CompressedG1(e);
expect_test_vector(v_iterator, expected);
expect_test_vector(v[i], expected);
ASSERT_TRUE(expected.to_libsnark_g1<curve_G1>() == e);
}
}
@@ -647,14 +646,13 @@ TEST(proofs, g1_test_vectors)
TEST(proofs, g2_test_vectors)
{
UniValue v = read_json(std::string(json_tests::g2_compressed, json_tests::g2_compressed + sizeof(json_tests::g2_compressed)));
std::vector<UniValue>::iterator v_iterator = v.getValues().begin();
curve_G2 e = curve_Fr("34958239045823") * curve_G2::one();
for (size_t i = 0; i < 10000; i++) {
e = (curve_Fr("34958239045823") ^ i) * e;
auto expected = CompressedG2(e);
expect_test_vector(v_iterator, expected);
expect_test_vector(v[i], expected);
ASSERT_TRUE(expected.to_libsnark_g2<curve_G2>() == e);
}
}