From b4fc4e0e60a45a14e83fbebbca1e8720697ffc52 Mon Sep 17 00:00:00 2001 From: Neylix Date: Wed, 13 Sep 2023 09:17:20 +0200 Subject: [PATCH] Rename Contract.from_contract function --- lib/archethic/contracts.ex | 8 ++-- lib/archethic/contracts/contract/constants.ex | 7 ++- lib/archethic/contracts/interpreter.ex | 2 +- .../contracts/contract/constants_test.exs | 3 +- .../interpreter/condition_validator_test.exs | 48 +++++++++---------- test/support/contract_factory.ex | 2 +- 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/lib/archethic/contracts.ex b/lib/archethic/contracts.ex index e748555377..3aedd296d9 100644 --- a/lib/archethic/contracts.ex +++ b/lib/archethic/contracts.ex @@ -86,7 +86,7 @@ defmodule Archethic.Contracts do case get_function_from_contract(contract, function_name, args) do {:ok, function} -> constants = %{ - "contract" => Constants.from_contract(contract_tx, contract_version), + "contract" => Constants.from_contract_transaction(contract_tx, contract_version), :time_now => DateTime.utc_now() |> DateTime.to_unix() } @@ -359,8 +359,8 @@ defmodule Archethic.Contracts do datetime ) do %{ - "previous" => Constants.from_contract(contract_tx, contract_version), - "next" => Constants.from_contract(transaction, contract_version), + "previous" => Constants.from_contract_transaction(contract_tx, contract_version), + "next" => Constants.from_contract_transaction(transaction, contract_version), :time_now => DateTime.to_unix(datetime), :functions => functions } @@ -374,7 +374,7 @@ defmodule Archethic.Contracts do ) do %{ "transaction" => Constants.from_transaction(transaction, contract_version), - "contract" => Constants.from_contract(contract_tx, contract_version), + "contract" => Constants.from_contract_transaction(contract_tx, contract_version), :time_now => DateTime.to_unix(datetime), :functions => functions } diff --git a/lib/archethic/contracts/contract/constants.ex b/lib/archethic/contracts/contract/constants.ex index 56468d842e..87e05ffbc3 100644 --- a/lib/archethic/contracts/contract/constants.ex +++ b/lib/archethic/contracts/contract/constants.ex @@ -23,9 +23,12 @@ defmodule Archethic.Contracts.ContractConstants do @doc """ Same as from_transaction but remove the contract_seed from ownerships """ - @spec from_contract(contract_tx :: Transaction.t(), contract_version :: non_neg_integer()) :: + @spec from_contract_transaction( + contract_tx :: Transaction.t(), + contract_version :: non_neg_integer() + ) :: map() - def from_contract(contract_tx, contract_version \\ 1), + def from_contract_transaction(contract_tx, contract_version \\ 1), do: contract_tx |> Contract.remove_seed_ownership() |> from_transaction(contract_version) @doc """ diff --git a/lib/archethic/contracts/interpreter.ex b/lib/archethic/contracts/interpreter.ex index cd0678fec6..1fa3146a09 100644 --- a/lib/archethic/contracts/interpreter.ex +++ b/lib/archethic/contracts/interpreter.ex @@ -162,7 +162,7 @@ defmodule Archethic.Contracts.Interpreter do trigger_tx -> Constants.from_transaction(trigger_tx, version) end - contract_constants = Constants.from_contract(contract_tx, version) + contract_constants = Constants.from_contract_transaction(contract_tx, version) constants = named_action_constants diff --git a/test/archethic/contracts/contract/constants_test.exs b/test/archethic/contracts/contract/constants_test.exs index 300d759e98..ac63e8c5aa 100644 --- a/test/archethic/contracts/contract/constants_test.exs +++ b/test/archethic/contracts/contract/constants_test.exs @@ -141,7 +141,8 @@ defmodule Archethic.Contracts.ContractConstantsTest do assert length(contract_tx.data.ownerships) == 2 - assert %{"ownerships" => [^ownership_hex]} = ContractConstants.from_contract(contract_tx) + assert %{"ownerships" => [^ownership_hex]} = + ContractConstants.from_contract_transaction(contract_tx) end end end diff --git a/test/archethic/contracts/interpreter/condition_validator_test.exs b/test/archethic/contracts/interpreter/condition_validator_test.exs index ee5a8384a6..e5fd104f32 100644 --- a/test/archethic/contracts/interpreter/condition_validator_test.exs +++ b/test/archethic/contracts/interpreter/condition_validator_test.exs @@ -51,8 +51,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end @@ -91,8 +91,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end @@ -110,8 +110,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end @@ -140,8 +140,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) code = ~s""" @@ -156,8 +156,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end @@ -294,8 +294,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) code = ~s""" @@ -313,8 +313,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end @@ -334,8 +334,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) code = ~s""" @@ -353,8 +353,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) code = ~s""" @@ -372,8 +372,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end @@ -396,8 +396,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end @@ -439,8 +439,8 @@ defmodule Archethic.Contracts.Interpreter.ConditionValidatorTest do |> ConditionInterpreter.parse([]) |> elem(2) |> ConditionValidator.valid_conditions?(%{ - "previous" => Constants.from_contract(previous_tx), - "next" => Constants.from_contract(next_tx) + "previous" => Constants.from_contract_transaction(previous_tx), + "next" => Constants.from_contract_transaction(next_tx) }) end end diff --git a/test/support/contract_factory.ex b/test/support/contract_factory.ex index 37e7f7c7e8..d121656ab6 100644 --- a/test/support/contract_factory.ex +++ b/test/support/contract_factory.ex @@ -86,7 +86,7 @@ defmodule Archethic.ContractFactory do if Map.has_key?(constants, "contract") do constants else - Map.put(constants, "contract", Constants.from_contract(contract_tx)) + Map.put(constants, "contract", Constants.from_contract_transaction(contract_tx)) end end end