Clean up data types.

1 files changed, 15 insertions, 21 deletions

diff --git a/src/plop.hrl b/src/plop.hrl
index e96b401..bfd900b 100644
--- a/src/plop.hrl
+++ b/src/plop.hrl
@@ -1,27 +1,21 @@
-% TODO: move to plop.hrl?
-%% -record(spt, {
-%%           version :: integer(),       % 8_bit_int
-%%           logid :: binary(),          % 32_bit_binary() sha256 hash
-%%           signed_data :: signed_data()
-%%          }).
--define(PLOP_ENTRY_TYPE_X509, 0).
--define(PLOP_ENTRY_TYPE_PRECERT, 1).
--define(PLOP_ENTRY_TYPE_TEST, 2).
--record(plop_entry, {
-          type = 0 :: integer(),                % uint16
-          entry = <<>> :: binary()
-         }).
--type(plop_entry() :: #plop_entry{}).
+%% A plop_entry has a type and some data.
+%% A plop_data record has the meta data necessary for constructing a
+%% signed timestamp.
 
--define(PLOP_SIGTYPE_CERTIFICATE_TIMESTAMP, 0).
--define(PLOP_SIGTYPE_TREE_HASH, 1).
--define(PLOP_SIGTYPE_TEST, 2).
 -record(plop_data, {
-          version = 1 :: integer(),             % uint8
-          signature_type = 0 :: integer(),      % uint8
-          timestamp = now :: 'now' | integer(), % 'now' or uint64
+          version = 1 :: integer(),
+          signature_type = certificate_timestamp :: certificate_timestamp |
+                                                    tree_hash |
+                                                    test,
+          timestamp = now :: 'now' | integer(),
           entry :: plop_entry()
+          }).
+-record(plop_entry, {
+          type = x509 :: x509 | precert | test,
+          data = <<>> :: binary()
          }).                   
+
 -type plop_data() :: #plop_data{}.
+-type plop_entry() :: #plop_entry{}.
 
--export_type([plop_entry/0, plop_data/0]).
+-export_type([plop_data/0, plop_entry/0]).