Merge pull request #2 from zcoinofficial/test_porting

Test porting

src/Makefile.test.include

@@ -39,6 +39,11 @@ RAW_TEST_FILES =
 GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
 
 BITCOIN_TESTS =\
+  libzerocoin/sigma/test/coin_tests.cpp \
+  libzerocoin/sigma/test/protocol_tests.cpp \
+  libzerocoin/sigma/test/unit_tests.cpp \
+  libzerocoin/sigma/test/R1_test.cpp \
+  libzerocoin/sigma/test/serialize_test.cpp \
   test/zerocoin_tests.cpp \
   test/zerocoin_tests2.cpp \
   test/zerocoin_tests3.cpp \
@@ -118,7 +123,7 @@ test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) tor/src/or/libtor.a \
 	tor/src/common/libcurve25519_donna.a \
 	tor/src/ext/ed25519/donna/libed25519_donna.a \
 	tor/src/ext/ed25519/ref10/libed25519_ref10.a \
-	tor/src/ext/keccak-tiny/libkeccak-tiny.a $(ZLIB_LIBS) -lz
+	tor/src/ext/keccak-tiny/libkeccak-tiny.a $(LIBSIGMA) $(ZLIB_LIBS) -lz
 
 test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
 test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)

src/gtest/sigma_R1_test.cpp → src/libzerocoin/sigma/test/R1_test.cpp

@@ -1,4 +1,5 @@
-#include <gtest/gtest.h>
+#include <boost/test/unit_test.hpp>
+
 #include <libzerocoin/sigma/R1Proof.h>
 #include <libzerocoin/sigma/R1ProofGenerator.h>
 #include <libzerocoin/sigma/R1ProofVerifier.h>
@@ -17,8 +18,9 @@ bool test(secp_primitives::GroupElement& g, std::vector<secp_primitives::GroupEl
     return verifier.verify(proof);
 }
 
+BOOST_AUTO_TEST_SUITE(sigma_R1_test)
 
-TEST(sigma_R1_test, fixed_size_test)
+BOOST_AUTO_TEST_CASE(fixed_size_test)
 {
     int n = 4;
     int m = 16;
@@ -39,10 +41,10 @@ TEST(sigma_R1_test, fixed_size_test)
         }
     }
 
-    EXPECT_TRUE(test(g, h_, b, n, m));
+    BOOST_CHECK(test(g, h_, b, n, m));
 }
 
-TEST(sigma_R1_test, random_size_test)
+BOOST_AUTO_TEST_CASE(random_size_test)
 {
     int n = rand() % 64 + 16;
     int m = rand() % 32 + 16;
@@ -61,11 +63,11 @@ TEST(sigma_R1_test, random_size_test)
         }
     }
 
-    EXPECT_TRUE(test(g, h_, b, n, m));
+    BOOST_CHECK(test(g, h_, b, n, m));
 }
 
 
-TEST(sigma_R1_test, all_positions)
+BOOST_AUTO_TEST_CASE(all_positions)
 {
     int n = 32;
     int m = 16;
@@ -85,13 +87,13 @@ TEST(sigma_R1_test, all_positions)
                     b.push_back(secp_primitives::Scalar(uint64_t(0)));
             }
         }
-        EXPECT_TRUE(test(g, h_, b, n, m));
+        BOOST_CHECK(test(g, h_, b, n, m));
         h_.clear();
         b.clear();
     }
 }
 
-TEST(sigma_R1_test, one_in_random_position)
+BOOST_AUTO_TEST_CASE(one_in_random_position)
 {
     int n = 32;
     int m = 16;
@@ -112,11 +114,11 @@ TEST(sigma_R1_test, one_in_random_position)
                 b.push_back(secp_primitives::Scalar(uint64_t(0)));
         }
     }
-    EXPECT_TRUE(test(g, h_, b, n, m));
+    BOOST_CHECK(test(g, h_, b, n, m));
 }
 
 
-TEST(sigma_R1_test, all_0s_in_random_row)
+BOOST_AUTO_TEST_CASE(all_0s_in_random_row)
 {
     int n = 32;
     int m = 16;
@@ -136,10 +138,10 @@ TEST(sigma_R1_test, all_0s_in_random_row)
                 b.push_back(secp_primitives::Scalar(uint64_t(0)));
         }
     }
-    EXPECT_FALSE(test(g, h_, b, n, m));
+    BOOST_CHECK(!test(g, h_, b, n, m)); // expect false
 }
 
-TEST(sigma_R1_test, all_1s_in_random_row)
+BOOST_AUTO_TEST_CASE(all_1s_in_random_row)
 {
     int n = 32;
     int m = 16;
@@ -159,11 +161,11 @@ TEST(sigma_R1_test, all_1s_in_random_row)
                 b.push_back(secp_primitives::Scalar(uint64_t(0)));
         }
     }
-    EXPECT_FALSE(test(g, h_, b, n, m));
+    BOOST_CHECK(!test(g, h_, b, n, m)); // expect false
 }
 
 
-TEST(sigma_R1_test, two_1s_in_random_row)
+BOOST_AUTO_TEST_CASE(two_1s_in_random_row)
 {
     int n = 32;
     int m = 16;
@@ -186,5 +188,7 @@ TEST(sigma_R1_test, two_1s_in_random_row)
                 b.push_back(secp_primitives::Scalar(uint64_t(0)));
         }
     }
-    EXPECT_FALSE(test(g, h_, b, n, m));
-}
+    BOOST_CHECK(!test(g, h_, b, n, m)); // expect false
+}
+
+BOOST_AUTO_TEST_SUITE_END()

src/libzerocoin/sigma/test/coin_tests.cpp

@@ -0,0 +1,35 @@
+#include "../Coin.h"
+#include "../Params.h"
+#include "../../../streams.h"
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_AUTO_TEST_SUITE(sigma_coin_tests)
+
+BOOST_AUTO_TEST_CASE(pubcoin_serialization)
+{
+    secp_primitives::GroupElement coin;
+    coin.randomize();
+
+    sigma::PublicCoinV3 pubcoin(coin, sigma::ZQ_GOLDWASSER);
+
+    CDataStream serialized(SER_NETWORK, PROTOCOL_VERSION);
+    serialized << pubcoin;
+
+    sigma::PublicCoinV3 deserialized;
+    serialized >> deserialized;
+
+    BOOST_CHECK(pubcoin == deserialized);
+}
+
+BOOST_AUTO_TEST_CASE(pubcoin_validate)
+{
+    auto params = sigma::ParamsV3::get_default();
+
+    sigma::PrivateCoinV3 privcoin(params);
+    auto& pubcoin = privcoin.getPublicCoin();
+
+    BOOST_CHECK(pubcoin.validate());
+}
+
+BOOST_AUTO_TEST_SUITE_END()

src/gtest/sigma_plus_test.cpp → src/libzerocoin/sigma/test/protocol_tests.cpp

@@ -1,14 +1,17 @@
-#include <gtest/gtest.h>
-#include <libzerocoin/sigma/SigmaPlusProver.h>
-#include <libzerocoin/sigma/SigmaPlusVerifier.h>
+#include "../SigmaPlusProver.h"
+#include "../SigmaPlusVerifier.h"
 
-TEST(test_1_out_of_N, EC_group)
+#include <boost/test/unit_test.hpp>
+
+BOOST_AUTO_TEST_SUITE(sigma_protocol_tests)
+
+BOOST_AUTO_TEST_CASE(one_out_of_n)
 {
     int N = 16;
     int n = 4;
     int index = 0;
 
-    int m = (int)(log(N) / log(n));;
+    int m = (int)(log(N) / log(n));
 
     secp_primitives::GroupElement g;
     g.randomize();
@@ -41,6 +44,8 @@ TEST(test_1_out_of_N, EC_group)
     prover.proof(commits, index, r, proof);
 
     sigma::SigmaPlusVerifier<secp_primitives::Scalar,secp_primitives::GroupElement> verifier(g, h_gens, n, m);
-   EXPECT_TRUE(verifier.verify(commits, proof));
 
-}
+    BOOST_CHECK(verifier.verify(commits, proof));
+}
+
+BOOST_AUTO_TEST_SUITE_END()