Skip to content
This repository has been archived by the owner on Mar 5, 2024. It is now read-only.

Fix poc eunits and reduce log level #619

Merged
merged 2 commits into from Sep 16, 2020
Merged

Fix poc eunits and reduce log level #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a796a4
Fix poc eunits
vihu Sep 15, 2020
7be14f7
Tune down log level
vihu Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 20 additions & 15 deletions src/transactions/v1/blockchain_txn_poc_receipts_v1.erl
View file
Open in desktop
Expand Up @@ -1081,7 +1081,7 @@ valid_receipt(PreviousElement, Element, Channel, Ledger) ->
true ->
case blockchain_poc_receipt_v1:channel(Receipt) == Channel of
true ->
lager:info("receipt ok"),
lager:debug("receipt ok"),
Receipt;
false ->
lager:warning("receipt ~p -> ~p rejected at height ~p for channel ~p /= ~p RSSI ~p SNR ~p",
Expand Down Expand Up @@ -1155,7 +1155,7 @@ valid_witnesses(Element, Channel, Ledger) ->
true ->
case blockchain_poc_witness_v1:channel(Witness) == Channel of
true ->
lager:info("witness ok"),
lager:debug("witness ok"),
true;
false ->
lager:warning("witness ~p -> ~p rejected at height ~p for channel ~p /= ~p RSSI ~p SNR ~p",
Expand Down Expand Up @@ -1348,20 +1348,25 @@ delta_test() ->
<<"bar">>,
<<"baz">>,
[{blockchain_poc_path_element_v1_pb,<<"first">>,
{blockchain_poc_receipt_v1_pb,<<"a">>,
123,0,
<<1,2,3,4>>,
p2p,
<<"b">>, 10.1, 912.4},
[]},
{blockchain_poc_receipt_v1_pb,<<"a">>,
123,0,
<<1,2,3,4>>,
p2p,
<<"b">>,
10.1,
912.4,
1,
<<"dr">>
},
[]},
{blockchain_poc_path_element_v1_pb,<<"c">>,
undefined,[]},
undefined,[]},
{blockchain_poc_path_element_v1_pb,<<"d">>,
undefined,[]},
undefined,[]},
{blockchain_poc_path_element_v1_pb,<<"e">>,
undefined,[]},
undefined,[]},
{blockchain_poc_path_element_v1_pb,<<"f">>,
undefined,[]}],
undefined,[]}],
0,
<<"g">>},
Deltas2 = deltas(Txn2),
Expand Down Expand Up @@ -1416,15 +1421,15 @@ to_json_test() ->
[{blockchain_poc_path_element_v1_pb,<<"first">>,
{blockchain_poc_receipt_v1_pb,<<"d">>,
123,0,<<"e">>,p2p,
<<"f">>, 10.1, 912.4},
<<"f">>, 10.1, 912.4, 1, <<"dr">>},
[{blockchain_poc_witness_v1_pb,<<"g">>,
456,-100,
<<"h">>,
<<"i">>, 10.1, 912.4},
<<"i">>, 10.1, 912.4, 1, <<"dr">>},
{blockchain_poc_witness_v1_pb,<<"j">>,
789,-114,
<<"k">>,
<<"l">>, 10.1, 912.4}]},
<<"l">>, 10.1, 912.4, 1, <<"dr">>}]},
{blockchain_poc_path_element_v1_pb,<<"second">>, undefined,[]},
{blockchain_poc_path_element_v1_pb,<<"m">>, undefined,[]},
{blockchain_poc_path_element_v1_pb,<<"n">>, undefined,[]},
Expand Down
2 changes: 1 addition & 1 deletion src/transactions/v1/blockchain_txn_rewards_v1.erl
View file
Open in desktop
Expand Up @@ -507,7 +507,7 @@ poc_challengees_rewards_(Version, [Elem|Path], StaticPath, Txn, Chain, Ledger, I
ElemPos = blockchain_utils:index_of(Elem, StaticPath),
WitnessChannel = lists:nth(ElemPos, Channels),
ValidWitnesses = blockchain_txn_poc_receipts_v1:valid_witnesses(Elem, WitnessChannel, Ledger),
lager:info("ValidWitnesses: ~p", [[blockchain_utils:addr2name(blockchain_poc_witness_v1:gateway(W)) || W <- ValidWitnesses]]),
lager:debug("ValidWitnesses: ~p", [[blockchain_utils:addr2name(blockchain_poc_witness_v1:gateway(W)) || W <- ValidWitnesses]]),
ValidWitnesses
catch What:Why:ST ->
lager:error("failed to calculate poc_challengees_rewards, error ~p:~p:~p", [What, Why, ST]),
Expand Down