remove ethereum tasks migration (#1828)

* remove ethereum tasks migration * backwards compatibility with OMG.OUTPUTs * lint
omgnetwork · Mar 23, 2021 · 2c68973 · 2c68973
1 parent 870eefd
commit 2c68973
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 286 deletions.
diff --git a/Makefile b/Makefile
@@ -436,7 +436,6 @@ start-watcher_info:
 	_build/${BAREBUILD_ENV}/rel/watcher_info/bin/watcher_info eval "OMG.DB.ReleaseTasks.InitKeyValueDB.run()" && \
 	_build/${BAREBUILD_ENV}/rel/watcher_info/bin/watcher_info eval "OMG.DB.ReleaseTasks.InitKeysWithValues.run()" && \
 	_build/${BAREBUILD_ENV}/rel/watcher_info/bin/watcher_info eval "OMG.WatcherInfo.ReleaseTasks.InitPostgresqlDB.migrate()" && \
-	_build/${BAREBUILD_ENV}/rel/watcher_info/bin/watcher_info eval "OMG.WatcherInfo.ReleaseTasks.EthereumTasks.run()" && \
 	echo "Run Watcher Info" && \
 	. ${OVERRIDING_VARIABLES} && \
 	PORT=${WATCHER_INFO_PORT} _build/${BAREBUILD_ENV}/rel/watcher_info/bin/watcher_info $(OVERRIDING_START)

diff --git a/apps/omg_watcher/lib/omg_watcher/merge_transaction_validator.ex b/apps/omg_watcher/lib/omg_watcher/merge_transaction_validator.ex
@@ -19,7 +19,7 @@ defmodule OMG.Watcher.MergeTransactionValidator do
   to know by the child chain to not require the transaction fees.
   """
 
-  alias OMG.Watcher.Output
+  alias OMG.Output
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.Utxo
 

diff --git a/apps/omg_watcher/lib/omg_watcher/output.ex b/apps/omg_watcher/lib/omg_watcher/output.ex
@@ -12,12 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defmodule OMG.Watcher.Output do
+defmodule OMG.Output do
   @moduledoc """
-  `OMG.Watcher.Output` and `OMG.Watcher.Output.Protocol` represent the outputs of transactions, i.e. the valuables or other pieces of
+   `OMG.Output` and `OMG.Output.Protocol` represent the outputs of transactions, i.e. the valuables or other pieces of
   data spendable via transactions on the child chain, and/or exitable to the root chain.
 
   This module specificially dispatches generic calls to the various specific types
+
+
+
+
+
+  THIS IS WHAT HAPPENS IF YOU STORE ELIXIR STRUCTS IN A DATABASE
+
+  This struct is binary encoded into RocksDB, so when we call `:erlang.binary_to_term(encoded, [:safe])`
+  for old outputs stored, it expects this struct to exist.
+  Just make sure they do the same thing!!!
+
   """
   alias OMG.Watcher.Crypto
   alias OMG.Watcher.RawData

diff --git a/apps/omg_watcher/lib/omg_watcher/state/core.ex b/apps/omg_watcher/lib/omg_watcher/state/core.ex
@@ -61,10 +61,10 @@ defmodule OMG.Watcher.State.Core do
     fee_claiming_started: false
   ]
 
+  alias OMG.Output
   alias OMG.Watcher.Block
   alias OMG.Watcher.Crypto
   alias OMG.Watcher.Fees
-  alias OMG.Watcher.Output
   alias OMG.Watcher.State.Core
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.State.Transaction.Validator

diff --git a/apps/omg_watcher/lib/omg_watcher/state/transaction.ex b/apps/omg_watcher/lib/omg_watcher/state/transaction.ex
@@ -131,7 +131,7 @@ defprotocol OMG.Watcher.State.Transaction.Protocol do
   Should be implemented for any type of transaction processed in the system
   """
 
-  alias OMG.Watcher.Output
+  alias OMG.Output
   alias OMG.Watcher.State.Transaction
 
   @doc """

diff --git a/apps/omg_watcher/lib/omg_watcher/state/transaction/fee.ex b/apps/omg_watcher/lib/omg_watcher/state/transaction/fee.ex
@@ -16,8 +16,8 @@ defmodule OMG.Watcher.State.Transaction.Fee do
   @moduledoc """
   Internal representation of a fee claiming transaction in plasma chain.
   """
+  alias OMG.Output
   alias OMG.Watcher.Crypto
-  alias OMG.Watcher.Output
   alias OMG.Watcher.State.Transaction
 
   require Transaction
@@ -99,7 +99,7 @@ defmodule OMG.Watcher.State.Transaction.Fee do
 end
 
 defimpl OMG.Watcher.State.Transaction.Protocol, for: OMG.Watcher.State.Transaction.Fee do
-  alias OMG.Watcher.Output
+  alias OMG.Output
   alias OMG.Watcher.State.Transaction
 
   @doc """
@@ -109,7 +109,7 @@ defimpl OMG.Watcher.State.Transaction.Protocol, for: OMG.Watcher.State.Transacti
   def get_data_for_rlp(%Transaction.Fee{tx_type: tx_type, outputs: outputs, nonce: nonce}) do
     [
       tx_type,
-      Enum.map(outputs, &OMG.Watcher.Output.get_data_for_rlp/1),
+      Enum.map(outputs, &Output.get_data_for_rlp/1),
       nonce
     ]
   end

diff --git a/apps/omg_watcher/lib/omg_watcher/state/transaction/payment.ex b/apps/omg_watcher/lib/omg_watcher/state/transaction/payment.ex
@@ -20,7 +20,7 @@ defmodule OMG.Watcher.State.Transaction.Payment do
   """
   alias OMG.Watcher.Crypto
 
-  alias OMG.Watcher.Output
+  alias OMG.Output
   alias OMG.Watcher.RawData
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.Utxo
@@ -155,7 +155,7 @@ defmodule OMG.Watcher.State.Transaction.Payment do
 end
 
 defimpl OMG.Watcher.State.Transaction.Protocol, for: OMG.Watcher.State.Transaction.Payment do
-  alias OMG.Watcher.Output
+  alias OMG.Output
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.Utxo
 
@@ -173,7 +173,7 @@ defimpl OMG.Watcher.State.Transaction.Protocol, for: OMG.Watcher.State.Transacti
       do: [
         tx_type,
         Enum.map(inputs, &OMG.Watcher.Utxo.Position.get_data_for_rlp/1),
-        Enum.map(outputs, &OMG.Watcher.Output.get_data_for_rlp/1),
+        Enum.map(outputs, &Output.get_data_for_rlp/1),
         # used to be optional and as such was `if`-appended if not null here
         # When it is not optional, and there's the if, dialyzer complains about the if
         0,

diff --git a/apps/omg_watcher/lib/omg_watcher/state/transaction/validator/payment.ex b/apps/omg_watcher/lib/omg_watcher/state/transaction/validator/payment.ex
@@ -18,8 +18,8 @@ defmodule OMG.Watcher.State.Transaction.Validator.Payment do
   Specific transaction type's validation is passed to `Transaction.Protocol.can_apply?`
   """
 
+  alias OMG.Output
   alias OMG.Watcher.Fees
-  alias OMG.Watcher.Output
   alias OMG.Watcher.State.Core
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.State.UtxoSet
@@ -71,5 +71,5 @@ defmodule OMG.Watcher.State.Transaction.Validator.Payment do
     |> if(do: :ok, else: {:error, :unauthorized_spend})
   end
 
-  defp can_spend?(%OMG.Watcher.Output{owner: owner}, witness), do: owner == witness
+  defp can_spend?(%Output{owner: owner}, witness), do: owner == witness
 end
diff --git a/apps/omg_watcher/lib/omg_watcher/state/utxo_set.ex b/apps/omg_watcher/lib/omg_watcher/state/utxo_set.ex
@@ -26,7 +26,7 @@ defmodule OMG.Watcher.State.UtxoSet do
 
   alias OMG.Watcher.Crypto
 
-  alias OMG.Watcher.Output
+  alias OMG.Output
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.Utxo
 

diff --git a/apps/omg_watcher/lib/omg_watcher/typed_data_hash.ex b/apps/omg_watcher/lib/omg_watcher/typed_data_hash.ex
@@ -18,8 +18,8 @@ defmodule OMG.Watcher.TypedDataHash do
   for structured transaction data. These `struct_txhash`es are later used as digest to sign and recover signatures.
   """
 
+  alias OMG.Output
   alias OMG.Watcher.Crypto
-  alias OMG.Watcher.Output
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.Utxo
 

diff --git a/apps/omg_watcher/lib/omg_watcher/typed_data_hash/tools.ex b/apps/omg_watcher/lib/omg_watcher/typed_data_hash/tools.ex
@@ -18,8 +18,8 @@ defmodule OMG.Watcher.TypedDataHash.Tools do
   See also: http://eips.ethereum.org/EIPS/eip-712
   """
 
+  alias OMG.Output
   alias OMG.Watcher.Crypto
-  alias OMG.Watcher.Output
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.TypedDataHash.Types
   alias OMG.Watcher.Utxo

diff --git a/apps/omg_watcher/lib/omg_watcher/utxo.ex b/apps/omg_watcher/lib/omg_watcher/utxo.ex
@@ -17,7 +17,7 @@ defmodule OMG.Watcher.Utxo do
   Manipulates a single unspent transaction output (UTXO) held be the child chain state.
   """
 
-  alias OMG.Watcher.Output
+  alias OMG.Output
   alias OMG.Watcher.State.Transaction
 
   defstruct [:output, :creating_txhash]
@@ -42,26 +42,26 @@ defmodule OMG.Watcher.Utxo do
   def to_db_value(%__MODULE__{output: output, creating_txhash: creating_txhash})
       when is_nil_or_binary(creating_txhash) do
     %{creating_txhash: creating_txhash}
-    |> Map.put(:output, OMG.Watcher.Output.to_db_value(output))
+    |> Map.put(:output, Output.to_db_value(output))
   end
 
   def from_db_value(%{output: output, creating_txhash: creating_txhash})
       when is_nil_or_binary(creating_txhash) do
     value = %{
-      output: OMG.Watcher.Output.from_db_value(output),
+      output: Output.from_db_value(output),
       creating_txhash: creating_txhash
     }
 
     struct!(__MODULE__, value)
   end
 
-  # Reading from old db format, only `OMG.Watcher.Output.FungibleMoreVPToken`
+  # Reading from old db format, only `OMG.Output.FungibleMoreVPToken`
   def from_db_value(%{owner: owner, currency: currency, amount: amount, creating_txhash: creating_txhash})
       when is_nil_or_binary(creating_txhash) do
     output = %{owner: owner, currency: currency, amount: amount}
 
     value = %{
-      output: OMG.Watcher.Output.from_db_value(output),
+      output: Output.from_db_value(output),
       creating_txhash: creating_txhash
     }
 

diff --git a/apps/omg_watcher/lib/omg_watcher/utxo_exit/core.ex b/apps/omg_watcher/lib/omg_watcher/utxo_exit/core.ex
@@ -17,6 +17,7 @@ defmodule OMG.Watcher.UtxoExit.Core do
   Module provides API for compose exit
   """
 
+  alias OMG.Output
   alias OMG.Watcher.Block
   alias OMG.Watcher.State.Transaction
   alias OMG.Watcher.Utxo
@@ -47,8 +48,7 @@ defmodule OMG.Watcher.UtxoExit.Core do
   def compose_deposit_standard_exit({:ok, {db_utxo_pos, db_utxo_value}}) do
     utxo_pos = Position.from_db_key(db_utxo_pos)
 
-    %Utxo{output: %OMG.Watcher.Output{amount: amount, currency: currency, owner: owner}} =
-      Utxo.from_db_value(db_utxo_value)
+    %Utxo{output: %Output{amount: amount, currency: currency, owner: owner}} = Utxo.from_db_value(db_utxo_value)
 
     tx = Transaction.Payment.new([], [{owner, currency, amount}])
     txs = [Transaction.Signed.encode(%Transaction.Signed{raw_tx: tx, sigs: []})]

diff --git a/apps/omg_watcher/lib/omg_watcher/wire_format_types.ex b/apps/omg_watcher/lib/omg_watcher/wire_format_types.ex
@@ -44,8 +44,8 @@ defmodule OMG.Watcher.WireFormatTypes do
   }
 
   @output_type_modules %{
-    1 => OMG.Watcher.Output,
-    2 => OMG.Watcher.Output
+    1 => OMG.Output,
+    2 => OMG.Output
   }
 
   @known_tx_types Map.keys(@tx_type_values)

diff --git a/apps/omg_watcher/test/omg_watcher/output_test.exs b/apps/omg_watcher/test/omg_watcher/output_test.exs
@@ -11,11 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-defmodule OMG.Watcher.OutputTest do
+defmodule OMG.OutputTest do
   @moduledoc false
 
   use ExUnit.Case, async: true
-  doctest OMG.Watcher.Output
+  alias OMG.Output
+  doctest OMG.Output
 
   describe "reconstruct/1" do
     test "returns an error if the output guard is invalid" do
@@ -28,12 +29,12 @@ defmodule OMG.Watcher.OutputTest do
         ]
       ]
 
-      assert {:error, :output_guard_cant_be_zero} = OMG.Watcher.Output.reconstruct(rlp_data)
+      assert {:error, :output_guard_cant_be_zero} = Output.reconstruct(rlp_data)
     end
 
     test "returns an error if the output is malformed" do
       rlp_data = []
-      assert {:error, :malformed_outputs} = OMG.Watcher.Output.reconstruct(rlp_data)
+      assert {:error, :malformed_outputs} = Output.reconstruct(rlp_data)
     end
   end
 end
diff --git a/apps/omg_watcher/test/omg_watcher/state/core_test.exs b/apps/omg_watcher/test/omg_watcher/state/core_test.exs
@@ -25,6 +25,7 @@ defmodule OMG.Watcher.State.CoreTest do
   require OMG.Watcher.Utxo
 
   alias OMG.Eth.Configuration
+  alias OMG.Output
   alias OMG.Watcher.Block
   alias OMG.Watcher.Fees
   alias OMG.Watcher.State.Core
@@ -1120,6 +1121,6 @@ defmodule OMG.Watcher.State.CoreTest do
   defp to_utxo_kv({blknum, txindex, oindex, owner, currency, amount}),
     do: {
       Utxo.position(blknum, txindex, oindex),
-      %Utxo{output: %OMG.Watcher.Output{amount: amount, currency: currency, owner: owner.addr}}
+      %Utxo{output: %Output{amount: amount, currency: currency, owner: owner.addr}}
     }
 end
diff --git a/apps/omg_watcher/test/omg_watcher/state/measurement_calculation_test.exs b/apps/omg_watcher/test/omg_watcher/state/measurement_calculation_test.exs
@@ -20,6 +20,7 @@ defmodule OMG.Watcher.State.MeasurementCalculationTest do
   use ExUnit.Case, async: true
 
   alias OMG.Eth.Encoding
+  alias OMG.Output
   alias OMG.Watcher.State.Core
   alias OMG.Watcher.Utxo
 
@@ -32,16 +33,16 @@ defmodule OMG.Watcher.State.MeasurementCalculationTest do
   test "calculate metrics from state", %{alice: alice, bob: bob, carol: carol} do
     utxos = %{
       Utxo.position(2_000, 4076, 3) => %OMG.Watcher.Utxo{
-        output: %OMG.Watcher.Output{amount: 700_000_000, currency: @eth, owner: alice}
+        output: %Output{amount: 700_000_000, currency: @eth, owner: alice}
       },
       Utxo.position(1_000, 2559, 0) => %OMG.Watcher.Utxo{
-        output: %OMG.Watcher.Output{amount: 111_111_111, currency: @not_eth, owner: alice}
+        output: %Output{amount: 111_111_111, currency: @not_eth, owner: alice}
       },
       Utxo.position(8_000, 4854, 2) => %OMG.Watcher.Utxo{
-        output: %OMG.Watcher.Output{amount: 77_000_000, currency: @eth, owner: bob}
+        output: %Output{amount: 77_000_000, currency: @eth, owner: bob}
       },
       Utxo.position(7_000, 4057, 3) => %OMG.Watcher.Utxo{
-        output: %OMG.Watcher.Output{amount: 222_222_222, currency: @not_eth, owner: carol}
+        output: %Output{amount: 222_222_222, currency: @not_eth, owner: carol}
       },
       Utxo.position(7_000, 4057, 4) => %OMG.Watcher.Utxo{output: %{}}
     }

diff --git a/apps/omg_watcher_info/lib/omg_watcher_info/release_tasks/ethereum_tasks.ex b/apps/omg_watcher_info/lib/omg_watcher_info/release_tasks/ethereum_tasks.ex