Merge pull request blockscout#27 from celo-org/mrsmkl/fix-ci

Fixing CI
Pedro-vk · Nov 18, 2019 · 9fcacb1 · 9fcacb1
2 parents 1a92f71 + c3c9465
commit 9fcacb1
Show file tree

Hide file tree

Showing 20 changed files with 116 additions and 73 deletions.
diff --git a/apps/explorer/lib/explorer/celo/abi_handler.ex b/apps/explorer/lib/explorer/celo/abi_handler.ex
@@ -1,5 +1,6 @@
 defmodule Explorer.Celo.AbiHandler do
   @moduledoc """
+  Caching the Celo contract ABIs
   """
 
   use GenServer

diff --git a/apps/explorer/lib/explorer/celo/account_reader.ex b/apps/explorer/lib/explorer/celo/account_reader.ex
@@ -4,11 +4,13 @@ defmodule Explorer.Celo.AccountReader do
   """
 
   require Logger
+  alias Explorer.Celo.AbiHandler
   alias Explorer.SmartContract.Reader
 
   def account_data(%{address: account_address}) do
-    with data = fetch_account_data(account_address),
-         {:ok, [name]} <- data["getName"],
+    data = fetch_account_data(account_address)
+
+    with {:ok, [name]} <- data["getName"],
          {:ok, [url]} <- data["getMetadataURL"],
          {:ok, [is_validator]} <- data["isValidator"],
          {:ok, [is_validator_group]} <- data["isValidatorGroup"],
@@ -32,56 +34,68 @@ defmodule Explorer.Celo.AccountReader do
   end
 
   def validator_data(%{address: address}) do
-    with data = fetch_validator_data(address),
-         {:ok, [_, affiliation, score]} <- data["getValidator"] do
-      {:ok,
-       %{
-         address: address,
-         group_address_hash: affiliation,
-         score: score
-       }}
-    else
-      _ -> :error
+    data = fetch_validator_data(address)
+
+    case data["getValidator"] do
+      {:ok, [_, affiliation, score]} ->
+        {:ok,
+         %{
+           address: address,
+           group_address_hash: affiliation,
+           score: score
+         }}
+
+      _ ->
+        :error
     end
   end
 
   def validator_group_data(%{address: address}) do
-    with data = fetch_validator_group_data(address),
-         {:ok, [_members, commission, _size_history]} <- data["getValidatorGroup"] do
-      {:ok,
-       %{
-         address: address,
-         commission: commission
-       }}
-    else
-      _ -> :error
+    data = fetch_validator_group_data(address)
+
+    case data["getValidatorGroup"] do
+      {:ok, [_members, commission, _size_history]} ->
+        {:ok,
+         %{
+           address: address,
+           commission: commission
+         }}
+
+      _ ->
+        :error
     end
   end
 
   # how to delete them from the table?
   def withdrawal_data(%{address: address}) do
-    with data = fetch_withdrawal_data(address),
-         {:ok, [values, timestamps]} <- data["getPendingWithdrawals"] do
-      {:ok,
-       %{
-         address: address,
-         withdrawals:
-           Enum.map(Enum.zip(values, timestamps), fn {v, t} -> %{address: address, amount: v, timestamp: t} end)
-       }}
-    else
-      _ -> :error
+    data = fetch_withdrawal_data(address)
+
+    case data["getPendingWithdrawals"] do
+      {:ok, [values, timestamps]} ->
+        {:ok,
+         %{
+           address: address,
+           withdrawals:
+             Enum.map(Enum.zip(values, timestamps), fn {v, t} -> %{address: address, amount: v, timestamp: t} end)
+         }}
+
+      _ ->
+        :error
     end
   end
 
   def validator_history(%{block_number: _block_number}) do
-    with data = fetch_validators(),
-         {:ok, [validators]} <- data["currentValidators"] do
-      {:ok,
-       %{
-         validators: validators
-       }}
-    else
-      _ -> :error
+    data = fetch_validators()
+
+    case data["currentValidators"] do
+      {:ok, [validators]} ->
+        {:ok,
+         %{
+           validators: validators
+         }}
+
+      _ ->
+        :error
     end
   end
 
@@ -117,7 +131,7 @@ defmodule Explorer.Celo.AccountReader do
     data
   end
 
-  defp fetch_validators() do
+  defp fetch_validators do
     data =
       call_methods([
         {:validators, "currentValidators", []}
@@ -137,7 +151,7 @@ defmodule Explorer.Celo.AccountReader do
   end
 
   defp call_methods(methods) do
-    contract_abi = Explorer.Celo.AbiHandler.get_abi()
+    contract_abi = AbiHandler.get_abi()
 
     methods
     |> Enum.map(&format_request/1)

diff --git a/apps/explorer/lib/explorer/chain/celo_account.ex b/apps/explorer/lib/explorer/chain/celo_account.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.CeloAccount do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, Wei, Address}
+  alias Explorer.Chain.{Address, Hash, Wei}
 
   #    @type account_type :: %__MODULE__{ :regular | :validator | :group }
 

diff --git a/apps/explorer/lib/explorer/chain/celo_validator.ex b/apps/explorer/lib/explorer/chain/celo_validator.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.CeloValidator do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, Wei, Address}
+  alias Explorer.Chain.{Address, Hash, Wei}
 
   @typedoc """
   * `address` - address of the validator.

diff --git a/apps/explorer/lib/explorer/chain/celo_validator_group.ex b/apps/explorer/lib/explorer/chain/celo_validator_group.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.CeloValidatorGroup do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, Wei, Address}
+  alias Explorer.Chain.{Address, Hash, Wei}
 
   @typedoc """
   * `address` - address of the validator.

diff --git a/apps/explorer/lib/explorer/chain/celo_validator_history.ex b/apps/explorer/lib/explorer/chain/celo_validator_history.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.CeloValidatorHistory do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, Address}
+  alias Explorer.Chain.{Address, Hash}
 
   @typedoc """
   * `address` - address of the validator.

diff --git a/apps/explorer/lib/explorer/chain/celo_withdrawal.ex b/apps/explorer/lib/explorer/chain/celo_withdrawal.ex
@@ -7,7 +7,7 @@ defmodule Explorer.Chain.CeloWithdrawal do
 
   use Explorer.Schema
 
-  alias Explorer.Chain.{Hash, Wei, Address}
+  alias Explorer.Chain.{Address, Hash, Wei}
 
   @typedoc """
   * `address` - address of the validator.

diff --git a/apps/explorer/lib/explorer/chain/import/runner/celo_accounts.ex b/apps/explorer/lib/explorer/chain/import/runner/celo_accounts.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Import.Runner.CeloAccounts do
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, CeloAccount}
+  alias Explorer.Chain.{CeloAccount, Import}
   alias Explorer.Chain.Import.Runner.Util
 
   import Ecto.Query, only: [from: 2]
@@ -62,7 +62,7 @@ defmodule Explorer.Chain.Import.Runner.CeloAccounts do
     {:ok, accounts}
   end
 
-  @spec insert(Repo.t(), [map()], Util.insert_option()) :: {:ok, [CeloAccount.t()]} | {:error, [Changeset.t()]}
+  @spec insert(Repo.t(), [map()], Util.insert_options()) :: {:ok, [CeloAccount.t()]} | {:error, [Changeset.t()]}
   defp insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = options) when is_list(changes_list) do
     on_conflict = Map.get_lazy(options, :on_conflict, &default_on_conflict/0)
 

diff --git a/apps/explorer/lib/explorer/chain/import/runner/celo_validator_groups.ex b/apps/explorer/lib/explorer/chain/import/runner/celo_validator_groups.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorGroups do
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, CeloValidatorGroup}
+  alias Explorer.Chain.{CeloValidatorGroup, Import}
   alias Explorer.Chain.Import.Runner.Util
 
   import Ecto.Query, only: [from: 2]
@@ -63,7 +63,7 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorGroups do
     {:ok, accounts}
   end
 
-  @spec insert(Repo.t(), [map()], Util.insert_option()) :: {:ok, [CeloValidatorGroup.t()]} | {:error, [Changeset.t()]}
+  @spec insert(Repo.t(), [map()], Util.insert_options()) :: {:ok, [CeloValidatorGroup.t()]} | {:error, [Changeset.t()]}
   defp insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = options) when is_list(changes_list) do
     on_conflict = Map.get_lazy(options, :on_conflict, &default_on_conflict/0)
 

diff --git a/apps/explorer/lib/explorer/chain/import/runner/celo_validator_history.ex b/apps/explorer/lib/explorer/chain/import/runner/celo_validator_history.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorHistory do
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, CeloValidatorHistory}
+  alias Explorer.Chain.{CeloValidatorHistory, Import}
   alias Explorer.Chain.Import.Runner.Util
 
   import Ecto.Query, only: [from: 2]
@@ -53,7 +53,7 @@ defmodule Explorer.Chain.Import.Runner.CeloValidatorHistory do
     # Enforce ShareLocks order (see docs: sharelocks.md)
     uniq_changes_list =
       changes_list
-      |> Enum.sort_by(changes_list, &{&1.block_number, &1.index})
+      |> Enum.sort_by(&{&1.block_number, &1.index})
       |> Enum.dedup_by(&{&1.block_number, &1.index})
 
     {:ok, _} =

diff --git a/apps/explorer/lib/explorer/chain/import/runner/celo_validators.ex b/apps/explorer/lib/explorer/chain/import/runner/celo_validators.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Import.Runner.CeloValidators do
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, CeloValidator}
+  alias Explorer.Chain.{CeloValidator, Import}
   alias Explorer.Chain.Import.Runner.Util
 
   import Ecto.Query, only: [from: 2]

diff --git a/apps/explorer/lib/explorer/chain/import/runner/celo_withdrawals.ex b/apps/explorer/lib/explorer/chain/import/runner/celo_withdrawals.ex
@@ -6,7 +6,7 @@ defmodule Explorer.Chain.Import.Runner.CeloWithdrawals do
   require Ecto.Query
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Import, CeloWithdrawal}
+  alias Explorer.Chain.{CeloWithdrawal, Import}
   alias Explorer.Chain.Import.Runner.Util
 
   import Ecto.Query, only: [from: 2]

diff --git a/apps/explorer/lib/explorer/chain/import/runner/util.ex b/apps/explorer/lib/explorer/chain/import/runner/util.ex
@@ -13,7 +13,7 @@ defmodule Explorer.Chain.Import.Runner.Util do
     |> Map.put(:timestamps, timestamps)
   end
 
-  @type insert_option :: %{
+  @type insert_options :: %{
           optional(:on_conflict) => Import.Runner.on_conflict(),
           required(:timeout) => timeout,
           required(:timestamps) => Import.timestamps()

diff --git a/apps/indexer/lib/indexer/fetcher/celo_account.ex b/apps/indexer/lib/indexer/fetcher/celo_account.ex
@@ -1,15 +1,20 @@
 defmodule Indexer.Fetcher.CeloAccount do
+  @moduledoc """
+  Fetches Celo accounts.
+  """
   use Indexer.Fetcher
   use Spandex.Decorators
 
   require Logger
 
   alias Indexer.Fetcher.CeloAccount.Supervisor, as: CeloAccountSupervisor
-  alias Explorer.Chain.CeloAccount
-  alias Explorer.Chain
+
   alias Explorer.Celo.AccountReader
+  alias Explorer.Chain
+  alias Explorer.Chain.CeloAccount
 
   alias Indexer.BufferedTask
+  alias Indexer.Fetcher.Util
 
   @behaviour BufferedTask
 
@@ -36,7 +41,7 @@ defmodule Indexer.Fetcher.CeloAccount do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
-    Indexer.Fetcher.Util.default_child_spec(init_options, gen_server_options, __MODULE__)
+    Util.default_child_spec(init_options, gen_server_options, __MODULE__)
   end
 
   @impl BufferedTask

diff --git a/apps/indexer/lib/indexer/fetcher/celo_validator.ex b/apps/indexer/lib/indexer/fetcher/celo_validator.ex
@@ -1,16 +1,20 @@
 defmodule Indexer.Fetcher.CeloValidator do
+  @moduledoc """
+  Fetches Celo validators.
+  """
   use Indexer.Fetcher
   use Spandex.Decorators
 
   require Logger
 
   alias Indexer.Fetcher.CeloValidator.Supervisor, as: CeloValidatorSupervisor
-  alias Explorer.Chain.CeloValidator
-  alias Explorer.Chain
+
   alias Explorer.Celo.AccountReader
-  alias Indexer.Fetcher.Util
+  alias Explorer.Chain
+  alias Explorer.Chain.CeloValidator
 
   alias Indexer.BufferedTask
+  alias Indexer.Fetcher.Util
 
   @behaviour BufferedTask
 

diff --git a/apps/indexer/lib/indexer/fetcher/celo_validator_group.ex b/apps/indexer/lib/indexer/fetcher/celo_validator_group.ex
@@ -1,15 +1,20 @@
 defmodule Indexer.Fetcher.CeloValidatorGroup do
+  @moduledoc """
+  Fetches Celo validator groups.
+  """
   use Indexer.Fetcher
   use Spandex.Decorators
 
   require Logger
 
   alias Indexer.Fetcher.CeloValidatorGroup.Supervisor, as: CeloValidatorGroupSupervisor
-  alias Explorer.Chain.CeloValidatorGroup
-  alias Explorer.Chain
+
   alias Explorer.Celo.AccountReader
+  alias Explorer.Chain
+  alias Explorer.Chain.CeloValidatorGroup
 
   alias Indexer.BufferedTask
+  alias Indexer.Fetcher.Util
 
   @behaviour BufferedTask
 
@@ -36,7 +41,7 @@ defmodule Indexer.Fetcher.CeloValidatorGroup do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
-    Indexer.Fetcher.Util.default_child_spec(init_options, gen_server_options, __MODULE__)
+    Util.default_child_spec(init_options, gen_server_options, __MODULE__)
   end
 
   @impl BufferedTask

diff --git a/apps/indexer/lib/indexer/fetcher/celo_validator_history.ex b/apps/indexer/lib/indexer/fetcher/celo_validator_history.ex
@@ -1,15 +1,20 @@
 defmodule Indexer.Fetcher.CeloValidatorHistory do
+  @moduledoc """
+  Fetches Celo validator history.
+  """
   use Indexer.Fetcher
   use Spandex.Decorators
 
   require Logger
 
   alias Indexer.Fetcher.CeloValidatorHistory.Supervisor, as: CeloValidatorHistorySupervisor
-  alias Explorer.Chain.CeloValidatorHistory
-  alias Explorer.Chain
+
   alias Explorer.Celo.AccountReader
+  alias Explorer.Chain
+  alias Explorer.Chain.CeloValidatorHistory
 
   alias Indexer.BufferedTask
+  alias Indexer.Fetcher.Util
 
   @behaviour BufferedTask
 
@@ -36,7 +41,7 @@ defmodule Indexer.Fetcher.CeloValidatorHistory do
 
   @doc false
   def child_spec([init_options, gen_server_options]) do
-    Indexer.Fetcher.Util.default_child_spec(init_options, gen_server_options, __MODULE__)
+    Util.default_child_spec(init_options, gen_server_options, __MODULE__)
   end
 
   @impl BufferedTask