Break include dependency on plop.hrl

4 files changed, 5 insertions, 21 deletions

diff --git a/src/db.erl b/src/db.erl
index 4bcdc1c..6315ae5 100644
--- a/src/db.erl
+++ b/src/db.erl
@@ -14,7 +14,6 @@
 
 -include_lib("stdlib/include/qlc.hrl").
 -include("db.hrl").
--include("$CTROOT/plop/include/plop.hrl").
 
 size() ->
     binary_to_integer(atomic:readfile(treesize_path())).
diff --git a/src/ht.erl b/src/ht.erl
index 7051b9e..e870dca 100644
--- a/src/ht.erl
+++ b/src/ht.erl
@@ -35,7 +35,6 @@
          code_change/3]).
 -export([testing_get_state/0, print_tree/0, print_tree/1]).
 
--include("$CTROOT/plop/include/plop.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -import(lists, [foreach/2, foldl/3, reverse/1]).
 
diff --git a/src/plop.erl b/src/plop.erl
index 30d05ca..0b101be 100644
--- a/src/plop.erl
+++ b/src/plop.erl
@@ -35,7 +35,7 @@
 -export([init/1, handle_call/3, terminate/2,
          handle_cast/2, handle_info/2, code_change/3]).
 
--include("$CTROOT/plop/include/plop.hrl").
+-include("plop.hrl").
 %%-include("db.hrl").
 -include_lib("public_key/include/public_key.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -211,11 +211,7 @@ sth(PrivKey, #sth_signed{version = Version, timestamp = Timestamp_in}) ->
                                   hash_alg = sha256,
                                   signature_alg = ecdsa},
                    signature = signhash(BinToSign, PrivKey)},
-    STH = #sth{
-             treesize = Treesize,
-             timestamp = Timestamp,
-             roothash = Roothash,
-             signature = Signature},
+    STH = {Treesize, Timestamp, Roothash, Signature},
     %%io:format("STH: ~p~nBinToSign: ~p~nSignature: ~p~nTimestamp: ~p~n",
     %%          [STH, BinToSign, Signature, Timestamp]),
     STH.
diff --git a/include/plop.hrl b/src/plop.hrl
index b04af0d..2e0d436 100644
--- a/include/plop.hrl
+++ b/src/plop.hrl
@@ -5,19 +5,9 @@
 %%% database storage, some for interfacing with consumers and some are
 %%% for serialisation.
 
-%% @doc Merkle Tree Leaf -- what's sent as 'leaf_input' in response to
-%% get-entries requests and also the input to the hash function for
-%% leaf hashes in the tree. RFC 6962 sect 3.4.
-
-%% An entry, without the timestamp. This is what we hash over and
-%% store in the the database for finding duplicated submissions.
--record(sth, {
-          treesize :: integer(),
-          timestamp :: integer(),
-          roothash :: binary(),
-          signature :: signature()
-         }).
--type sth() :: #sth{}.
+%% Signed tree head
+%% {Treesize, Timestamp, Roothash, Signature}
+-type sth() :: tuple(integer(), integer(), binary(), signature()).
 
 %% RFC 5246 7.4.1.4.1
 -type hash_alg_type() :: none | md5 | sha1 | sha224 | sha256 | sha384 |