From ac839ba049d96f2f0a1caaac033defe42cc10624 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Mon, 26 May 2014 10:22:38 +0200
Subject: Make tests use v1=0 too.

---
 src/plop.erl       |  7 +++----
 test/plop_test.erl | 10 +++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/plop.erl b/src/plop.erl
index ba74ead..9a75465 100644
--- a/src/plop.erl
+++ b/src/plop.erl
@@ -409,17 +409,16 @@ serialise(#signature{
        Signature/binary>>].
 
 %%%%%%%%%%%%%%%%%%%%
-%% Tests.
+%% Internal tests. For more tests see ../test/.
 serialise_test_() ->
     [?_assertEqual(
-        <<1:8, 0:8, 0:64, 0:16, "foo">>,
+        <<0:8, 0:8, 0:64, 0:16, "foo">>,
         list_to_binary(serialise(#spt_signed{
-                                    version = 1,
+                                    version = 0,
                                     signature_type = certificate_timestamp,
                                     timestamp = 0,
                                     entry_type = x509,
                                     signed_entry = <<"foo">>})))].
-%%add_test_() ->
 add_test() ->
     {ok, S} = init([?TESTPRIVKEYFILE, ?TESTPUBKEYFILE]),
 
diff --git a/test/plop_test.erl b/test/plop_test.erl
index 1a10e42..26ac354 100644
--- a/test/plop_test.erl
+++ b/test/plop_test.erl
@@ -38,8 +38,8 @@ add(0, Pubkey) ->
                                                    data = Msg}},
     SPT = plop:add(Entry),
     <<Version:8, _LogID:256, Timestamp:64, Signature/binary>> = SPT,
-    Signed = <<1:8, 0:8, 4711:64, 2:16, Msg/binary>>,
-    ?assertEqual(1, Version),
+    Signed = <<0:8, 0:8, 4711:64, 2:16, Msg/binary>>,
+    ?assertEqual(0, Version),
     ?assertEqual(4711, Timestamp),
     ?assert(public_key:verify(Signed, sha256, Signature, Pubkey));
 
@@ -49,8 +49,8 @@ add(1, Pubkey) ->
                                entry = #plop_entry{type = test,
                                                    data = Msg}},
     <<Version:8, _LogID:256, Timestamp:64, Signature/binary>> = plop:add(Entry),
-    Signed = <<1:8, 0:8, 4712:64, 2:16, Msg/binary>>,
-    ?assertEqual(1, Version),
+    Signed = <<0:8, 0:8, 4712:64, 2:16, Msg/binary>>,
+    ?assertEqual(0, Version),
     ?assertEqual(4712, Timestamp),
     ?assert(public_key:verify(Signed, sha256, Signature, Pubkey)).
 
@@ -70,5 +70,5 @@ sth(0, Pubkey) ->
       Roothash:256,
       Signature/binary>> = STH,
     ?assertEqual(2, Treesize),
-    Data = <<1:8, 1:8, Timestamp:64, Treesize:64, Roothash:256>>,
+    Data = <<0:8, 2:8, Timestamp:64, Treesize:64, Roothash:256>>,
     ?assert(public_key:verify(Data, sha256, Signature, Pubkey)).
-- 
cgit v1.1