Skip to content

Commit 8dc3273

Browse files
committed
fix: compilation warnings
1 parent 2e11a4b commit 8dc3273

File tree

7 files changed

+34
-26
lines changed

7 files changed

+34
-26
lines changed

explorer/lib/abi/AlignedProofAggregationService.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

explorer/lib/abi/AlignedProofAggregationServiceDeployer.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

explorer/lib/explorer/beacon_client.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ defmodule Explorer.BeaconClient do
3232
request = Finch.build(:get, @beacon_url <> method, headers)
3333
response = Finch.request(request, Explorer.Finch)
3434

35-
case status do
35+
case response do
3636
{:ok, %Finch.Response{status: 200, body: body}} ->
3737
case Jason.decode(body) do
3838
{:ok, decoded_body} -> {:ok, decoded_body}

explorer/lib/explorer/contract_managers/aligned_proof_aggregation_service.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ defmodule AlignedProofAggregationService do
3333
@contract_address
3434
end
3535

36-
def get_aggregated_proof_event(%{from_block: number, to_block: number}) do
36+
def get_aggregated_proof_event(%{from_block: fromBlock, to_block: toBlock}) do
3737
events =
3838
AlignedProofAggregationService.EventFilters.new_aggregated_proof(nil)
3939
|> Ethers.get_logs(fromBlock: fromBlock, toBlock: toBlock)
@@ -49,7 +49,7 @@ defmodule AlignedProofAggregationService do
4949
block_number = x |> Map.get(:block_number)
5050
tx_hash = x |> Map.get(:transaction_hash)
5151

52-
%{
52+
{
5353
:ok,
5454
%{
5555
number: topics_raw |> Enum.at(1),

explorer/lib/explorer/models/aggregated_proofs.ex

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@ defmodule AggregatedProofs do
44
import Ecto.Changeset
55
import Ecto.Query
66

7-
# Different from proofs.ex (we could use the same but the hashes are constructed different)
8-
@primary_key {:id, :integer, autogenerate: true}
9-
schema "proofs_agg_mode" do
10-
field(:aggregated_proof_number, :integer)
11-
field(:proof_hash, :string)
12-
end
13-
14-
def changeset_proof(proof, attrs) do
15-
proofs
16-
|> cast(attrs, [:aggregated_proof_number, :proof_hash])
17-
|> validate_required([:aggregated_proof_number, :proof_hash])
18-
end
19-
207
@primary_key {:number, :integer, autogenerate: false}
218
schema "aggregated_proofs" do
229
field(:merkle_root, :string)
@@ -71,9 +58,4 @@ defmodule AggregatedProofs do
7158
|> Explorer.Repo.update()
7259
end
7360
end
74-
75-
def insert_proof(proof) do
76-
changeset = changeset_proof(proof)
77-
Explorer.Repo.insert(changeset)
78-
end
7961
end
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
defmodule AggregationModeProof do
2+
require Logger
3+
use Ecto.Schema
4+
import Ecto.Changeset
5+
import Ecto.Query
6+
7+
# Different from proofs.ex (we could use the same but the hashes are constructed different)
8+
@primary_key {:id, :id, autogenerate: true}
9+
schema "proofs_agg_mode" do
10+
field(:aggregated_proof_number, :integer)
11+
field(:proof_hash, :string)
12+
end
13+
14+
def changeset(proof, attrs) do
15+
proof
16+
|> cast(attrs, [:aggregated_proof_number, :proof_hash])
17+
|> validate_required([:aggregated_proof_number, :proof_hash])
18+
end
19+
20+
def insert_proof(proof) do
21+
changeset =
22+
AggregationModeProof.changeset(%AggregationModeProof{}, Map.from_struct(proof))
23+
24+
Explorer.Repo.insert(changeset)
25+
end
26+
end

explorer/lib/explorer/periodically.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,22 @@ defmodule Explorer.Periodically do
103103
# Split the blob data in chunks of 32 to get the number of leaves (number of proofs) in the aggregated proof
104104
## TODO fix this parsing
105105
proofs_leaves =
106-
Enum.map(aggregated_proofs, fn x -> chunk_every(x.blob_data, 32) end)
106+
Enum.map(aggregated_proofs, fn x -> Enum.chunk_every(x.blob_data, 32) end)
107107

108108
# Store aggregated proofs to db
109109
aggregated_proofs
110110
|> Enum.zip(proofs_leaves)
111-
|> Enum.map(fn %{agg_proof, leaves} ->
111+
|> Enum.map(fn {agg_proof, leaves} ->
112112
Map.merge(agg_proof, %{number_of_proofs: length(leaves)})
113113
|> Enum.each(fn x -> AggregatedProof.insert_or_update(x) end)
114114
end)
115115

116116
# Store each individual proof
117117
aggregated_proofs
118118
|> Enum.zip(proofs_leaves)
119-
|> Enum.map(fn %{agg_proof, leaves} ->
119+
|> Enum.map(fn {agg_proof, leaves} ->
120120
Enum.each(leaves, fn leaf ->
121-
AggregatedProof.insert_proof(%{
121+
AggregationModeProof.insert_proof(%{
122122
aggregated_proof_number: agg_proof.number,
123123
proof_hash: leaf
124124
})

0 commit comments

Comments
 (0)