Skip to content

Commit

Permalink
Rename scheduler module
Browse files Browse the repository at this point in the history
  • Loading branch information
Neylix committed Jun 28, 2022
1 parent 932e2ad commit e0468bf
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 31 deletions.
2 changes: 1 addition & 1 deletion config/dev.exs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ config :archethic, Archethic.Networking.Scheduler, interval: "0 * * * * * *"

# -----end-of-Networking-dev-configs-----

config :archethic, Archethic.Reward.RewardScheduler,
config :archethic, Archethic.Reward.Scheduler,
# At the 30th second
interval: "30 * * * * *"

Expand Down
2 changes: 1 addition & 1 deletion config/prod.exs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ config :archethic, Archethic.OracleChain.Scheduler,
# Aggregate chain every day at midnight
summary_interval: System.get_env("ARCHETHIC_ORACLE_CHAIN_SUMMARY_INTERVAL", "0 0 0 * * * *")

config :archethic, Archethic.Reward.RewardScheduler,
config :archethic, Archethic.Reward.Scheduler,
# Every day at 02:00:00
interval: System.get_env("ARCHETHIC_REWARD_SCHEDULER_INTERVAL", "0 0 2 * * * *")

Expand Down
2 changes: 1 addition & 1 deletion config/test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ config :archethic, Archethic.Mining.PendingTransactionValidation, validate_node_
config :archethic, Archethic.Metrics.Poller, enabled: false
config :archethic, Archethic.Metrics.Collector, MockMetricsCollector

config :archethic, Archethic.Reward.RewardScheduler, enabled: false
config :archethic, Archethic.Reward.Scheduler, enabled: false

config :archethic, Archethic.SelfRepair.Scheduler,
enabled: false,
Expand Down
26 changes: 10 additions & 16 deletions lib/archethic/reward.ex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ defmodule Archethic.Reward do
alias Archethic.P2P
alias Archethic.P2P.Node

alias __MODULE__.RewardScheduler
alias __MODULE__.Scheduler

alias Archethic.TransactionChain.Transaction
alias Archethic.TransactionChain.TransactionData
Expand All @@ -38,18 +38,12 @@ defmodule Archethic.Reward do
## Examples
iex> case Reward.new_rewards_mint(2_000_000_000) do
...> %{
...> type: :mint_rewards,
...> data: %{
...> content: "{\\n \\"supply\\":2000000000,\\n \\"type\\":\\"fungible\\",\\n \\"name\\":\\"Mining UCO rewards\\",\\n \\"symbol\\":\\"MUCO\\"\\n}\\n"
...> }
...> } ->
...> :ok
...> _ ->
...> :error
...> end
:ok
iex> %{
...> type: :mint_rewards,
...> data: %{
...> content: "{\\n \\"supply\\":2000000000,\\n \\"type\\":\\"fungible\\",\\n \\"name\\":\\"Mining UCO rewards\\",\\n \\"symbol\\":\\"MUCO\\"\\n}\\n"
...> }
...> } = Reward.new_rewards_mint(2_000_000_000)
"""
@spec new_rewards_mint(amount :: non_neg_integer()) :: Transaction.t()
def new_rewards_mint(amount) do
Expand Down Expand Up @@ -99,11 +93,11 @@ defmodule Archethic.Reward do
Returns the last date of the rewards scheduling from the network pool
"""
@spec last_scheduling_date() :: DateTime.t()
defdelegate last_scheduling_date, to: RewardScheduler, as: :last_date
defdelegate last_scheduling_date, to: Scheduler, as: :last_date

def config_change(changed_conf) do
changed_conf
|> Keyword.get(RewardScheduler)
|> RewardScheduler.config_change()
|> Keyword.get(Scheduler)
|> Scheduler.config_change()
end
end
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule Archethic.Reward.RewardScheduler do
defmodule Archethic.Reward.Scheduler do
@moduledoc false

use GenServer
Expand Down
4 changes: 2 additions & 2 deletions lib/archethic/reward/supervisor.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ defmodule Archethic.Reward.Supervisor do

use Supervisor

alias Archethic.Reward.RewardScheduler
alias Archethic.Reward.Scheduler

alias Archethic.Utils

Expand All @@ -13,7 +13,7 @@ defmodule Archethic.Reward.Supervisor do

def init(_) do
children = [
{RewardScheduler, Application.get_env(:archethic, RewardScheduler)}
{Scheduler, Application.get_env(:archethic, Scheduler)}
]

Supervisor.init(Utils.configurable_children(children), strategy: :one_for_one)
Expand Down
8 changes: 4 additions & 4 deletions test/archethic/mining/pending_transaction_validation_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defmodule Archethic.Mining.PendingTransactionValidationTest do

alias Archethic.SharedSecrets.MemTables.NetworkLookup

alias Archethic.Reward.RewardScheduler
alias Archethic.Reward.Scheduler

alias Archethic.P2P
alias Archethic.P2P.Message.FirstPublicKey
Expand Down Expand Up @@ -359,7 +359,7 @@ defmodule Archethic.Mining.PendingTransactionValidationTest do

NetworkLookup.set_network_pool_address(address)

RewardScheduler.start_link(interval: "0 * * * * *")
Scheduler.start_link(interval: "0 * * * * *")

MockDB
|> stub(:get_latest_burned_fees, fn -> 300_000_000 end)
Expand Down Expand Up @@ -391,7 +391,7 @@ defmodule Archethic.Mining.PendingTransactionValidationTest do

NetworkLookup.set_network_pool_address(address)

RewardScheduler.start_link(interval: "0 * * * * *")
Scheduler.start_link(interval: "0 * * * * *")

MockDB
|> stub(:get_latest_burned_fees, fn -> 200_000_000 end)
Expand Down Expand Up @@ -424,7 +424,7 @@ defmodule Archethic.Mining.PendingTransactionValidationTest do

NetworkLookup.set_network_pool_address(:crypto.strong_rand_bytes(32))

RewardScheduler.start_link(interval: "0 * * * * *")
Scheduler.start_link(interval: "0 * * * * *")

MockDB
|> stub(:get_latest_burned_fees, fn -> 300_000_000 end)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule Archethic.Reward.RewardSchedulerTest do
defmodule Archethic.Reward.SchedulerTest do
use ArchethicCase, async: false

alias Archethic.Crypto
Expand All @@ -7,7 +7,7 @@ defmodule Archethic.Reward.RewardSchedulerTest do
alias Archethic.P2P.Node
alias Archethic.P2P.Message.StartMining

alias Archethic.Reward.RewardScheduler
alias Archethic.Reward.Scheduler

import Mox

Expand All @@ -27,7 +27,7 @@ defmodule Archethic.Reward.RewardSchedulerTest do
MockDB
|> stub(:get_latest_burned_fees, fn -> 0 end)

assert {:ok, pid} = RewardScheduler.start_link(interval: "*/1 * * * * *")
assert {:ok, pid} = Scheduler.start_link(interval: "*/1 * * * * *")

assert %{interval: "*/1 * * * * *"} = :sys.get_state(pid)

Expand Down Expand Up @@ -57,7 +57,7 @@ defmodule Archethic.Reward.RewardSchedulerTest do
send(me, type)
end)

assert {:ok, pid} = RewardScheduler.start_link(interval: "*/1 * * * * *")
assert {:ok, pid} = Scheduler.start_link(interval: "*/1 * * * * *")

send(
pid,
Expand All @@ -83,7 +83,7 @@ defmodule Archethic.Reward.RewardSchedulerTest do
send(me, type)
end)

assert {:ok, pid} = RewardScheduler.start_link(interval: "*/1 * * * * *")
assert {:ok, pid} = Scheduler.start_link(interval: "*/1 * * * * *")

send(
pid,
Expand Down

0 comments on commit e0468bf

Please sign in to comment.