From cf68261c0549591b41ac644b80324691d328bd74 Mon Sep 17 00:00:00 2001 From: apoorv-2204 Date: Tue, 28 Feb 2023 20:48:12 +0530 Subject: [PATCH] Resolves Dialyzer Warning and Oracle Test failures - Dialyzer warning was due to a missing archethic alias - Oracle test failures were due to a persistent term not being nil or cleared after tests --- lib/archethic/bootstrap.ex | 1 + lib/archethic/oracle_chain/scheduler.ex | 25 ++++--------------- lib/archethic/reward/scheduler.ex | 15 +++-------- lib/archethic/self_repair/scheduler.ex | 12 ++------- lib/archethic/self_repair/sync.ex | 2 +- lib/archethic_web/channels/user_socket.ex | 1 + .../archethic/oracle_chain/scheduler_test.exs | 2 ++ test/archethic_web/graphql_schema_test.exs | 3 +++ 8 files changed, 19 insertions(+), 42 deletions(-) diff --git a/lib/archethic/bootstrap.ex b/lib/archethic/bootstrap.ex index 5bede171c5..938e2b217e 100644 --- a/lib/archethic/bootstrap.ex +++ b/lib/archethic/bootstrap.ex @@ -3,6 +3,7 @@ defmodule Archethic.Bootstrap do Manage Archethic Node Bootstrapping """ + alias Archethic alias Archethic.{Bootstrap, Crypto, Networking, P2P, P2P.Node} alias Archethic.{SelfRepair, SelfRepair.Resync, TransactionChain} diff --git a/lib/archethic/oracle_chain/scheduler.ex b/lib/archethic/oracle_chain/scheduler.ex index 7d4a85649a..9131a33930 100644 --- a/lib/archethic/oracle_chain/scheduler.ex +++ b/lib/archethic/oracle_chain/scheduler.ex @@ -2,26 +2,11 @@ defmodule Archethic.OracleChain.Scheduler do @moduledoc """ Manage the scheduling of the oracle transactions """ - - alias Archethic.Crypto - - alias Archethic.Election - - alias Archethic.P2P - alias Archethic.P2P.Node - - alias Archethic.PubSub - - alias Archethic.OracleChain - alias Archethic.OracleChain.Services - alias Archethic.OracleChain.Summary - - alias Archethic.TransactionChain - alias Archethic.TransactionChain.Transaction - alias Archethic.TransactionChain.TransactionData - - alias Archethic.Utils - alias Archethic.Utils.DetectNodeResponsiveness + alias Archethic + alias Archethic.{Crypto, Election, P2P, P2P.Node, PubSub, Utils} + alias Archethic.{OracleChain, TransactionChain, Utils.DetectNodeResponsiveness} + alias OracleChain.{Services, Summary} + alias TransactionChain.{Transaction, TransactionData} alias Crontab.CronExpression.Parser, as: CronParser diff --git a/lib/archethic/reward/scheduler.ex b/lib/archethic/reward/scheduler.ex index d43d08d1c9..a3a1495167 100644 --- a/lib/archethic/reward/scheduler.ex +++ b/lib/archethic/reward/scheduler.ex @@ -4,17 +4,10 @@ defmodule Archethic.Reward.Scheduler do use GenStateMachine, callback_mode: [:handle_event_function] @vsn Mix.Project.config()[:version] - alias Archethic.{ - Crypto, - PubSub, - DB, - P2P, - P2P.Node, - Reward, - Election, - Utils, - Utils.DetectNodeResponsiveness - } + alias Archethic + + alias Archethic.{Crypto, PubSub, DB, P2P, P2P.Node} + alias Archethic.{Reward, Election, Utils, Utils.DetectNodeResponsiveness} require Logger diff --git a/lib/archethic/self_repair/scheduler.ex b/lib/archethic/self_repair/scheduler.ex index 301fd65d4a..90384795e2 100644 --- a/lib/archethic/self_repair/scheduler.ex +++ b/lib/archethic/self_repair/scheduler.ex @@ -5,16 +5,8 @@ defmodule Archethic.SelfRepair.Scheduler do """ use GenServer @vsn Mix.Project.config()[:version] - - alias Archethic.P2P - - alias Archethic.SelfRepair.Sync - - alias Archethic.TaskSupervisor - - alias Archethic.Utils - - alias Archethic.PubSub + alias Archethic + alias Archethic.{P2P, SelfRepair.Sync, TaskSupervisor, Utils, PubSub} alias Archethic.Bootstrap.Sync, as: BootstrapSync diff --git a/lib/archethic/self_repair/sync.ex b/lib/archethic/self_repair/sync.ex index acdea38d54..d7e3629732 100644 --- a/lib/archethic/self_repair/sync.ex +++ b/lib/archethic/self_repair/sync.ex @@ -1,6 +1,6 @@ defmodule Archethic.SelfRepair.Sync do @moduledoc false - + alias Archethic alias Archethic.BeaconChain alias Archethic.BeaconChain.Subset.P2PSampling alias Archethic.BeaconChain.Summary diff --git a/lib/archethic_web/channels/user_socket.ex b/lib/archethic_web/channels/user_socket.ex index 9c0f733f0f..dc0b431d0f 100644 --- a/lib/archethic_web/channels/user_socket.ex +++ b/lib/archethic_web/channels/user_socket.ex @@ -8,6 +8,7 @@ defmodule ArchethicWeb.UserSocket do require Logger + alias Archethic ## Channels # channel "room:*", ArchethicWeb.RoomChannel diff --git a/test/archethic/oracle_chain/scheduler_test.exs b/test/archethic/oracle_chain/scheduler_test.exs index 5aff7a49f8..ca4061db41 100644 --- a/test/archethic/oracle_chain/scheduler_test.exs +++ b/test/archethic/oracle_chain/scheduler_test.exs @@ -405,6 +405,8 @@ defmodule Archethic.OracleChain.SchedulerTest do end test "should wait for node up message to start the scheduler and node_down to stop the scheduler, node: authorized and available" do + :persistent_term.put(:archethic_up, nil) + P2P.add_and_connect_node(%Node{ ip: {127, 0, 0, 1}, port: 3002, diff --git a/test/archethic_web/graphql_schema_test.exs b/test/archethic_web/graphql_schema_test.exs index c53964b257..44fe612ab9 100644 --- a/test/archethic_web/graphql_schema_test.exs +++ b/test/archethic_web/graphql_schema_test.exs @@ -865,6 +865,9 @@ defmodule ArchethicWeb.GraphQLSchemaTest do |> stub(:send_message, fn _, %GetCurrentSummaries{}, _ -> {:ok, []} + + _, %GetBeaconSummariesAggregate{}, _ -> + {:ok, %NotFound{}} end) conn =