bump git modules, fix tests

omgnetwork · Jan 22, 2021 · aac332c · aac332c
1 parent bd9661b
commit aac332c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -645,7 +645,7 @@ jobs:
           command: |
             make init_test
             cp ./localchain_contract_addresses.env ./priv/cabbage/apps/itest/localchain_contract_addresses.env
-            docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;)
+            docker-compose -f docker-compose.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;)
       - run:
           name: Log daemon services
           command: make cabbage-logs
@@ -761,7 +761,7 @@ jobs:
           command: |
             make init_test_reorg
             cp ./localchain_contract_addresses.env ./priv/cabbage/apps/itest/localchain_contract_addresses.env
-            docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;)
+            docker-compose -f docker-compose.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;)
       - run:
           name: Log daemon services
           command: make cabbage-logs-reorg

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "priv/cabbage"]
 	path = priv/cabbage
 	url = git@github.com:omgnetwork/specs.git
-	branch = inomurko/configurable_exit_id_sizer
+	branch = master
diff --git a/Makefile b/Makefile
@@ -398,7 +398,7 @@ docker-remote-watcher_info:
 ###
 start-services:
 	SNAPSHOT=SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120 make init_test && \
-	docker-compose -f ./docker-compose.yml -f ./docker-compose.feefeed.yml up feefeed geth nginx postgres
+	docker-compose -f ./docker-compose.yml up feefeed geth nginx postgres
 
 start-watcher:
 	. ${OVERRIDING_VARIABLES} && \

diff --git a/apps/omg_eth/test/omg_eth/root_chain/abi_test.exs b/apps/omg_eth/test/omg_eth/root_chain/abi_test.exs
@@ -543,7 +543,7 @@ defmodule OMG.Eth.RootChain.AbiTest do
 
   test "if exit started can be decoded" do
     exit_started_log = %{
-      :event_signature => "ExitStarted(address,uint168,uint256)",
+      :event_signature => "ExitStarted(address,uint168,uint256,bytes)",
       "address" => "0x92ce4d7773c57d96210c46a07b89acf725057f21",
       "blockHash" => "0x1bee6f75c74ceeb4817dc160e2fb56dd1337a9fc2980a2b013252cf1e620f246",
       "blockNumber" => "0x" <> Integer.to_string(726, 16),
@@ -561,7 +561,7 @@ defmodule OMG.Eth.RootChain.AbiTest do
 
     assert Abi.decode_log(exit_started_log) == %{
              eth_height: 726,
-             event_signature: "ExitStarted(address,uint168,uint256)",
+             event_signature: "ExitStarted(address,uint168,uint256,bytes)",
              log_index: 1,
              root_chain_txhash:
                <<74, 130, 72, 184, 138, 23, 178, 190, 76, 96, 134, 161, 152, 70, 34, 222, 26, 96, 221, 163, 201, 221,

diff --git a/apps/omg_eth/test/omg_eth/root_chain_test.exs b/apps/omg_eth/test/omg_eth/root_chain_test.exs
@@ -90,7 +90,7 @@ defmodule OMG.Eth.RootChainTest do
 
   defp exit_id_from_receipt(%{"logs" => logs}) do
     topic =
-      "ExitStarted(address,uint160)"
+      "ExitStarted(address,uint168,uint256,bytes)"
       |> Crypto.keccak_hash()
       |> Encoding.to_hex()
 

diff --git a/apps/omg_watcher/test/omg_watcher/ethereum_event_aggregator_test.exs b/apps/omg_watcher/test/omg_watcher/ethereum_event_aggregator_test.exs
@@ -88,7 +88,7 @@ defmodule OMG.Watcher.EthereumEventAggregatorTest do
                  enrich: false
                ],
                [
-                 signature: "ExitStarted(address,uint168,uint256)",
+                 signature: "ExitStarted(address,uint168,uint256,bytes)",
                  name: :exit_started,
                  enrich: false
                ],
@@ -106,7 +106,7 @@ defmodule OMG.Watcher.EthereumEventAggregatorTest do
       assert event_fetcher_name |> :sys.get_state() |> Map.get(:event_signatures) |> Enum.sort() ==
                Enum.sort([
                  "DepositCreated(address,uint256,address,uint256)",
-                 "ExitStarted(address,uint168,uint256)",
+                 "ExitStarted(address,uint168,uint256,bytes)",
                  "InFlightExitDeleted(uint168)",
                  "InFlightExitInputPiggybacked(address,bytes32,uint16)",
                  "InFlightExitOutputPiggybacked(address,bytes32,uint16)",
@@ -473,7 +473,7 @@ defmodule OMG.Watcher.EthereumEventAggregatorTest do
 
   def exit_started_log(block_number) do
     %{
-      :event_signature => "ExitStarted(address,uint168,uint256)",
+      :event_signature => "ExitStarted(address,uint168,uint256,bytes)",
       "address" => "0x92ce4d7773c57d96210c46a07b89acf725057f21",
       "blockHash" => "0x1bee6f75c74ceeb4817dc160e2fb56dd1337a9fc2980a2b013252cf1e620f246",
       "blockNumber" => "0x" <> Integer.to_string(block_number, 16),