From c53defda9d811d4c7e20b521b8cc2a2eea12a075 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 30 Aug 2018 21:37:10 +0100 Subject: [PATCH] libsnark: Force constants used in test comparisons to be unsigned --- .../libsnark/algebra/fields/tests/test_bigint.cpp | 14 +++++++------- .../libsnark/algebra/fields/tests/test_fields.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/snark/libsnark/algebra/fields/tests/test_bigint.cpp b/src/snark/libsnark/algebra/fields/tests/test_bigint.cpp index 11a799ff0..24832ed51 100644 --- a/src/snark/libsnark/algebra/fields/tests/test_bigint.cpp +++ b/src/snark/libsnark/algebra/fields/tests/test_bigint.cpp @@ -34,8 +34,8 @@ TEST(algebra, bigint) EXPECT_NE(b0, b1); EXPECT_FALSE(b0 == b1); - EXPECT_EQ(b2.max_bits(), 128); - EXPECT_EQ(b2.num_bits(), 99); + EXPECT_EQ(b2.max_bits(), 128u); + EXPECT_EQ(b2.num_bits(), 99u); for (size_t i = 0; i < 128; i++) { EXPECT_EQ(b2.test_bit(i), (b2_binary[127-i] == '1')); } @@ -59,7 +59,7 @@ TEST(algebra, bigint) bigint<2> quotient; bigint<2> remainder; bigint<3>::div_qr(quotient, remainder, b3, b2); - EXPECT_LT(quotient.num_bits(), GMP_NUMB_BITS); + EXPECT_LT(quotient.num_bits(), static_cast(GMP_NUMB_BITS)); EXPECT_EQ(quotient.as_uint64(), b1.as_uint64()); bigint<1> b1inc = bigint<1>("76749408"); bigint<1> b1a = quotient.shorten(b1inc, "test"); @@ -77,14 +77,14 @@ TEST(algebra, bigint) EXPECT_FALSE(b3a > b3); bigint<3>::div_qr(quotient, remainder, b3, b2); - EXPECT_LT(quotient.num_bits(), GMP_NUMB_BITS); + EXPECT_LT(quotient.num_bits(), static_cast(GMP_NUMB_BITS)); EXPECT_EQ(quotient.as_uint64(), b1.as_uint64()); - EXPECT_LT(remainder.num_bits(), GMP_NUMB_BITS); - EXPECT_EQ(remainder.as_uint64(), 42); + EXPECT_LT(remainder.num_bits(), static_cast(GMP_NUMB_BITS)); + EXPECT_EQ(remainder.as_uint64(), 42u); b3a.clear(); EXPECT_TRUE(b3a.is_zero()); - EXPECT_EQ(b3a.num_bits(), 0); + EXPECT_EQ(b3a.num_bits(), 0u); EXPECT_FALSE(b3.is_zero()); bigint<4> bx = bigint<4>().randomize(); diff --git a/src/snark/libsnark/algebra/fields/tests/test_fields.cpp b/src/snark/libsnark/algebra/fields/tests/test_fields.cpp index 969800d8b..2101fad9d 100644 --- a/src/snark/libsnark/algebra/fields/tests/test_fields.cpp +++ b/src/snark/libsnark/algebra/fields/tests/test_fields.cpp @@ -88,7 +88,7 @@ void test_Frobenius() template void test_unitary_inverse() { - EXPECT_EQ(FieldT::extension_degree() % 2, 0); + EXPECT_EQ(FieldT::extension_degree() % 2, 0u); FieldT a = FieldT::random_element(); FieldT aqcubed_minus1 = a.Frobenius_map(FieldT::extension_degree()/2) * a.inverse(); EXPECT_EQ(aqcubed_minus1.inverse(), aqcubed_minus1.unitary_inverse());