From 5ecbcd7b569fe45da43294debf995b0add93674a Mon Sep 17 00:00:00 2001 From: Neylix Date: Wed, 25 Jan 2023 15:45:34 +0100 Subject: [PATCH] Fix conflict --- lib/archethic/contracts/interpreter/library.ex | 4 +++- lib/archethic/contracts/loader.ex | 16 ++++++---------- .../pending_transaction_validation_test.exs | 2 +- test/archethic/replication_test.exs | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/lib/archethic/contracts/interpreter/library.ex b/lib/archethic/contracts/interpreter/library.ex index ada08213c3..f98b429a39 100644 --- a/lib/archethic/contracts/interpreter/library.ex +++ b/lib/archethic/contracts/interpreter/library.ex @@ -14,6 +14,8 @@ defmodule Archethic.Contracts.Interpreter.Library do alias Archethic.P2P.Message.GenesisAddress alias Archethic.P2P.Message.FirstPublicKey + alias Archethic.Contracts.Interpreter.Utils + @doc """ Match a regex expression @@ -143,7 +145,7 @@ defmodule Archethic.Contracts.Interpreter.Library do :blake2b end - :crypto.hash(algo, decode_binary(content)) + :crypto.hash(algo, Utils.maybe_decode_hex(content)) |> Base.encode16() end diff --git a/lib/archethic/contracts/loader.ex b/lib/archethic/contracts/loader.ex index 23e4863849..b0f2695259 100644 --- a/lib/archethic/contracts/loader.ex +++ b/lib/archethic/contracts/loader.ex @@ -103,16 +103,12 @@ defmodule Archethic.Contracts.Loader do protocol_version ) - case Worker.execute(contract_address, tx) do - :ok -> - Logger.info("Transaction towards contract ingested", - transaction_address: Base.encode16(tx_address), - transaction_type: tx_type - ) - - _ -> - :ok - end + Worker.execute(contract_address, tx) + + Logger.info("Transaction towards contract ingested", + transaction_address: Base.encode16(tx_address), + transaction_type: tx_type + ) end) end diff --git a/test/archethic/mining/pending_transaction_validation_test.exs b/test/archethic/mining/pending_transaction_validation_test.exs index 707fddd087..8c58937f8b 100644 --- a/test/archethic/mining/pending_transaction_validation_test.exs +++ b/test/archethic/mining/pending_transaction_validation_test.exs @@ -186,7 +186,7 @@ defmodule Archethic.Mining.PendingTransactionValidationTest do assert :ok = PoolsMemTable.put_pool_member(:technical_council, tx.previous_public_key) MockDB - |> expect(:get_transaction, fn _, _ -> + |> expect(:get_transaction, fn _, _, _ -> {:ok, %Transaction{ data: %TransactionData{ diff --git a/test/archethic/replication_test.exs b/test/archethic/replication_test.exs index b81f99b8e1..82f5256a98 100644 --- a/test/archethic/replication_test.exs +++ b/test/archethic/replication_test.exs @@ -311,7 +311,7 @@ defmodule Archethic.ReplicationTest do MockDB |> expect(:get_genesis_address, fn _ -> "@Alice0" end) - |> expect(:get_transaction, fn _, _ -> + |> expect(:get_transaction, fn _, _, _ -> {:ok, %Transaction{ validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}, @@ -344,7 +344,7 @@ defmodule Archethic.ReplicationTest do MockDB |> expect(:get_genesis_address, fn _ -> "@Alice0" end) - |> expect(:get_transaction, fn _, _ -> + |> expect(:get_transaction, fn _, _, _ -> {:ok, %Transaction{ validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()},