merge from masterv2

omgnetwork · Mar 12, 2021 · 18004d7 · 18004d7
1 parent ea1262c
commit 18004d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "priv/cabbage"]
 	path = priv/cabbage
 	url = git@github.com:omgnetwork/specs.git
-	branch = master
+	branch = master-v2
diff --git a/apps/omg_watcher_info/test/omg_watcher_info/block_applicator_test.exs b/apps/omg_watcher_info/test/omg_watcher_info/block_applicator_test.exs
@@ -23,7 +23,7 @@ defmodule OMG.WatcherInfo.BlockApplicatorTest do
   import Ecto.Query, only: [where: 2]
 
   setup do
-    eth = OMG.Eth.zero_address()
+    eth = <<0::160>>
     alice = OMG.TestHelper.generate_entity()
     tx = OMG.TestHelper.create_recovered([{1, 0, 0, alice}], eth, [{alice, 100}])