From ac53699656776f3fe8757e4fe96d1101c5c56681 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 13 Nov 2015 16:01:09 +0100 Subject: Follow catlfish change in how request() is being called. --- src/frontend.erl | 27 +++++++++++++++------------ src/signing.erl | 8 +++++--- src/storage.erl | 12 +++++++----- 3 files changed, 27 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/frontend.erl b/src/frontend.erl index a7ca153..60f588a 100644 --- a/src/frontend.erl +++ b/src/frontend.erl @@ -5,9 +5,12 @@ -module(frontend). %% API (URL) --export([request/3]). +-export([request/4]). -request(post, "plop/v1/frontend/sendentry", Input) -> +-define(APPURL_PLOP_FRONTEND, "plop/v1/frontend"). +-define(APPURL_PLOP_MERGE, "plop/v1/merge"). + +request(post, ?APPURL_PLOP_FRONTEND, "sendentry", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -19,7 +22,7 @@ request(post, "plop/v1/frontend/sendentry", Input) -> success({[{result, <<"ok">>}]}) end; -request(post, "plop/v1/frontend/sendlog", Input) -> +request(post, ?APPURL_PLOP_FRONTEND, "sendlog", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -29,7 +32,7 @@ request(post, "plop/v1/frontend/sendlog", Input) -> write_or_verify_index(Start, Hashes) end; -request(post, "plop/v1/frontend/sendsth", Input) -> +request(post, ?APPURL_PLOP_FRONTEND, "sendsth", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -66,12 +69,12 @@ request(post, "plop/v1/frontend/sendsth", Input) -> end; -request(get, "plop/v1/frontend/currentposition", _Query) -> +request(get, ?APPURL_PLOP_FRONTEND, "currentposition", _Query) -> Size = db:size(), success({[{result, <<"ok">>}, {position, Size}]}); -request(get, "plop/v1/frontend/missingentries", _Query) -> +request(get, ?APPURL_PLOP_FRONTEND, "missingentries", _Query) -> Size = db:size(), Missing = fetchmissingentries(Size, 100000), lager:debug("missingentries: ~p", [Missing]), @@ -79,7 +82,7 @@ request(get, "plop/v1/frontend/missingentries", _Query) -> {entries, lists:map(fun (Entry) -> base64:encode(Entry) end, Missing)}]}); -request(post, "plop/v1/merge/sendentry", Input) -> +request(post, ?APPURL_PLOP_MERGE, "sendentry", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -99,7 +102,7 @@ request(post, "plop/v1/merge/sendentry", Input) -> success({[{result, <<"ok">>}]}) end; -request(post, "plop/v1/merge/sendlog", Input) -> +request(post, ?APPURL_PLOP_MERGE, "sendlog", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -109,7 +112,7 @@ request(post, "plop/v1/merge/sendlog", Input) -> write_or_verify_index(Start, Hashes) end; -request(post, "plop/v1/merge/verifyroot", Input) -> +request(post, ?APPURL_PLOP_MERGE, "verifyroot", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -139,12 +142,12 @@ request(post, "plop/v1/merge/verifyroot", Input) -> end end; -request(get, "plop/v1/merge/verifiedsize", _Query) -> +request(get, ?APPURL_PLOP_MERGE, "verifiedsize", _Query) -> Size = db:verifiedsize(), success({[{result, <<"ok">>}, {size, Size}]}); -request(post, "plop/v1/merge/setverifiedsize", Input) -> +request(post, ?APPURL_PLOP_MERGE, "setverifiedsize", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("setverifiedsize: bad input:", E); @@ -165,7 +168,7 @@ request(post, "plop/v1/merge/setverifiedsize", Input) -> end; -request(get, "plop/v1/merge/missingentries", _Query) -> +request(get, ?APPURL_PLOP_MERGE, "missingentries", _Query) -> Size = db:verifiedsize(), Missing = fetchmissingentries(Size, 100000), lager:debug("missingentries: ~p", [Missing]), diff --git a/src/signing.erl b/src/signing.erl index eedf8f7..86ccb88 100644 --- a/src/signing.erl +++ b/src/signing.erl @@ -5,9 +5,11 @@ -module(signing). %% API (URL) --export([request/3]). +-export([request/4]). -request(post, "plop/v1/signing/sct", Input) -> +-define(APPURL_PLOP_SIGNING, "plop/v1/signing"). + +request(post, ?APPURL_PLOP_SIGNING, "sct", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -17,7 +19,7 @@ request(post, "plop/v1/signing/sct", Input) -> Result = sign:sign_sct(Data), success({[{result, base64:encode(Result)}]}) end; -request(post, "plop/v1/signing/sth", Input) -> +request(post, ?APPURL_PLOP_SIGNING, "sth", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); diff --git a/src/storage.erl b/src/storage.erl index 6c38adf..a1f62f9 100644 --- a/src/storage.erl +++ b/src/storage.erl @@ -5,9 +5,11 @@ -module(storage). %% API (URL) --export([request/3]). +-export([request/4]). -request(post, "plop/v1/storage/sendentry", Input) -> +-define(APPURL_PLOP_STORAGE, "plop/v1/storage"). + +request(post, ?APPURL_PLOP_STORAGE, "sendentry", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -19,7 +21,7 @@ request(post, "plop/v1/storage/sendentry", Input) -> ok = storagedb:add(TreeLeafHash), success({[{result, <<"ok">>}]}) end; -request(post, "plop/v1/storage/entrycommitted", Input) -> +request(post, ?APPURL_PLOP_STORAGE, "entrycommitted", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("entrycommitted: bad input:", E); @@ -29,7 +31,7 @@ request(post, "plop/v1/storage/entrycommitted", Input) -> db:add_entryhash(LeafHash, EntryHash), success({[{result, <<"ok">>}]}) end; -request(get, "plop/v1/storage/fetchnewentries", _Input) -> +request(get, ?APPURL_PLOP_STORAGE, "fetchnewentries", _Input) -> {LastIndexOrZero, LastHash} = storagedb:lastverifiednewentry(), LastVerifiedAndNewHashes = storagedb:fetchnewhashes(LastIndexOrZero), NewHashes = case {LastHash, LastVerifiedAndNewHashes} of @@ -45,7 +47,7 @@ request(get, "plop/v1/storage/fetchnewentries", _Input) -> end, NewHashes), success({[{result, <<"ok">>}, {entries, Entries}]}); -request(get, "plop/v1/storage/getentry", Query) -> +request(get, ?APPURL_PLOP_STORAGE, "getentry", Query) -> Hashes = [base64:decode(Value) || {Key, Value} <- Query, Key == "hash"], Entries = lists:map(fun(LeafHash) -> {[{hash, base64:encode(LeafHash)}, -- cgit v1.1