Rename some variable and function names; add a NEWS entry.

1 files changed, 14 insertions, 12 deletions

diff --git a/src/plop.erl b/src/plop.erl
index 46b402b..7c7ded7 100644
--- a/src/plop.erl
+++ b/src/plop.erl
@@ -25,10 +25,11 @@
 %% API.
 -export([initsize/0]).
 -export([get_logid/0, serialise/1, signature_type/1]).
--export([add/2, commit/3, sth/0, get/1, get/2, spt/2,
+-export([add/2, commit/3, sth/0, get/1, get/2, spt_sig/2,
          consistency/2, inclusion/2, inclusion_and_entry/2]).
 -export([generate_timestamp/0, save_sth/1, verify_sth/4]).
--export([get_by_leaf_hash/1, entry_for_leafhash/1, spt_from_entry/1, get_spt/1, add_spt/2]).
+-export([get_by_leaf_hash/1, entry_for_leafhash/1, spt_data_from_entry/1,
+         get_spt_sig/1, add_spt_sig/2]).
 %% API for tests.
 -export([testing_get_pubkey/0]).
 
@@ -96,14 +97,14 @@ spt_data(Entry) ->
     {ok, {Module, Function}} = application:get_env(plop, spt_data),
     Module:Function(Entry).
 
-spt_from_entry(LogEntry) ->
+spt_data_from_entry(LogEntry) ->
     spt_data(unwrap_entry(LogEntry)).
 
-get_spt(Hash) ->
+get_spt_sig(Hash) ->
     perm:getvalue(sptcache, Hash).
 
-add_spt(LeafHash, SPT) ->
-    ok = perm:addvalue(sptcache, LeafHash, SPT),
+add_spt_sig(LeafHash, SPTSig) ->
+    ok = perm:addvalue(sptcache, LeafHash, SPTSig),
     perm:commit(sptcache),
     ok.
 
@@ -122,14 +123,14 @@ add(LogEntry, TreeLeafHash) ->
               end)
     end.
 
-commit(TreeLeafHash, EntryHash, SPT) ->
+commit(TreeLeafHash, EntryHash, SPTSig) ->
     Nodes = storage_nodes(),
     util:spawn_and_wait(
       fun () ->
               lists:foreach(
                 fun (URLBase) ->
                         send_storage_entrycommitted(URLBase, EntryHash,
-                                                    TreeLeafHash, SPT)
+                                                    TreeLeafHash, SPTSig)
                 end, Nodes)
       end).
 
@@ -180,11 +181,12 @@ get(Hash) ->
             {notfetched, LeafHash, unwrap_entry(Entry)}
     end.
 
-spt(Data, Signatures) ->
+spt_sig(Data, StorageSignatures) ->
+    Sig = sign:sign_sct(Data, StorageSignatures),
     #signature{algorithm = #sig_and_hash_alg{
                               hash_alg = sha256,
                               signature_alg = ecdsa},
-               signature = sign:sign_sct(Data, Signatures)}.
+               signature = Sig}.
 
 consistency(TreeSizeFirst, TreeSizeSecond) ->
     TreeSize = db:size(),
@@ -279,12 +281,12 @@ send_storage_sendentry(URLBase, LogEntry, TreeLeafHash) ->
     RequestId = send_http_request(TreeLeafHash, URLBase ++ "sendentry", [{"Content-Type", "text/json"}], list_to_binary(Request)),
     {RequestId, URLBase}.
 
-send_storage_entrycommitted(URLBase, EntryHash, TreeLeafHash, SPT) ->
+send_storage_entrycommitted(URLBase, EntryHash, TreeLeafHash, SPTSig) ->
     Request = mochijson2:encode(
                 {[{plop_version, 1},
                   {entryhash, base64:encode(EntryHash)},
                   {treeleafhash, base64:encode(TreeLeafHash)},
-                  {timestamp_signature, base64:encode(SPT)}
+                  {timestamp_signature, base64:encode(SPTSig)}
                  ]}),
     send_http_request(TreeLeafHash, URLBase ++ "entrycommitted", [{"Content-Type", "text/json"}], list_to_binary(Request)).