summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-10-21 17:16:50 +0200
committerMagnus Ahltorp <map@kth.se>2014-10-22 16:41:41 +0200
commit668a24fd4043355547ef2694d47b0f0c380c424c (patch)
treeff31b5e30ee29e3b20174ad8602884daa88eeae8 /src
parent77f5f5fb1396609803e3b1b13f39c4f3498a6612 (diff)
Break include dependency on plop.hrlexternal-merge-rebased
Diffstat (limited to 'src')
-rw-r--r--src/catlfish.erl1
-rw-r--r--src/v1.erl11
2 files changed, 4 insertions, 8 deletions
diff --git a/src/catlfish.erl b/src/catlfish.erl
index e261824..ae4da9d 100644
--- a/src/catlfish.erl
+++ b/src/catlfish.erl
@@ -3,7 +3,6 @@
-module(catlfish).
-export([add_chain/2, entries/2, entry_and_proof/2]).
--include("$CTROOT/plop/include/plop.hrl").
-define(PROTOCOL_VERSION, 0).
diff --git a/src/v1.erl b/src/v1.erl
index ba5c456..535fc8f 100644
--- a/src/v1.erl
+++ b/src/v1.erl
@@ -9,8 +9,6 @@
'get-sth-consistency'/3, 'get-proof-by-hash'/3, 'get-entries'/3,
'get-roots'/3, 'get-entry-and-proof'/3]).
--include("$CTROOT/plop/include/plop.hrl").
-
%% Public functions, i.e. part of URL.
'add-chain'(SessionID, _Env, Input) ->
R = case (catch jiffy:decode(Input)) of
@@ -34,11 +32,10 @@
niy(SessionID).
'get-sth'(SessionID, _Env, _Input) ->
- #sth{
- treesize = Treesize,
- timestamp = Timestamp,
- roothash = Roothash,
- signature = Signature} = plop:sth(),
+ { Treesize,
+ Timestamp,
+ Roothash,
+ Signature} = plop:sth(),
R = [{tree_size, Treesize},
{timestamp, Timestamp},
{sha256_root_hash, base64:encode(Roothash)},