Skip to content

Commit 37a593d

Browse files
committed
Fix some warnings from compile and credo
1 parent 654b5ea commit 37a593d

File tree

2 files changed

+35
-30
lines changed

2 files changed

+35
-30
lines changed

lib/lambda_ethereum_consensus/validator/duties.ex

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -80,40 +80,45 @@ defmodule LambdaEthereumConsensus.Validator.Duties do
8080
committee_index :: Types.uint64()
8181
) :: [{Types.slot(), attester_duty()}]
8282
defp compute_attester_dutys(state, epoch, slot, validators, committee_index) do
83-
with {:ok, committee} <- Accessors.get_beacon_committee(state, slot, committee_index) do
84-
committee
85-
|> Stream.with_index()
86-
|> Stream.flat_map(fn {validator_index, index_in_committee} ->
87-
case Map.get(validators, validator_index) do
88-
nil ->
89-
[]
90-
91-
validator ->
92-
[
93-
%{
94-
slot: slot,
95-
validator_index: validator_index,
96-
index_in_committee: index_in_committee,
97-
committee_length: length(committee),
98-
committee_index: committee_index,
99-
attested?: false
100-
}
101-
|> update_with_aggregation_duty(state, validator.keystore.privkey)
102-
|> update_with_subnet_id(state, epoch)
103-
]
104-
end
105-
end)
106-
|> Enum.into([])
107-
|> case do
108-
[] -> []
109-
duties -> [{slot, duties}]
110-
end
111-
else
83+
case Accessors.get_beacon_committee(state, slot, committee_index) do
84+
{:ok, committee} ->
85+
compute_cometee_duties(state, epoch, slot, committee, committee_index, validators)
86+
11287
{:error, _} ->
11388
[]
11489
end
11590
end
11691

92+
defp compute_cometee_duties(state, epoch, slot, committee, committee_index, validators) do
93+
committee
94+
|> Stream.with_index()
95+
|> Stream.flat_map(fn {validator_index, index_in_committee} ->
96+
case Map.get(validators, validator_index) do
97+
nil ->
98+
[]
99+
100+
validator ->
101+
[
102+
%{
103+
slot: slot,
104+
validator_index: validator_index,
105+
index_in_committee: index_in_committee,
106+
committee_length: length(committee),
107+
committee_index: committee_index,
108+
attested?: false
109+
}
110+
|> update_with_aggregation_duty(state, validator.keystore.privkey)
111+
|> update_with_subnet_id(state, epoch)
112+
]
113+
end
114+
end)
115+
|> Enum.into([])
116+
|> case do
117+
[] -> []
118+
duties -> [{slot, duties}]
119+
end
120+
end
121+
117122
defp check_valid_epoch(state, epoch) do
118123
next_epoch = Accessors.get_current_epoch(state) + 1
119124

lib/lambda_ethereum_consensus/validator/validator.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ defmodule LambdaEthereumConsensus.Validator do
540540
defp log_info(index, message, metadata \\ []),
541541
do: Logger.info("[Validator] #{index} #{message}", metadata)
542542

543-
defp log_debug(index, message, metadata \\ []),
543+
defp log_debug(index, message, metadata),
544544
do: Logger.debug("[Validator] #{index} #{message}", metadata)
545545

546546
defp log_error(index, message, reason, metadata \\ []),

0 commit comments

Comments
 (0)