From fbd6e435b87980fed19c6b0642a537a70dca6f7a Mon Sep 17 00:00:00 2001
From: matejcik <ja@matejcik.cz>
Date: Mon, 13 May 2019 17:57:29 +0200
Subject: [PATCH] ci: simplify running defs checks

---
 Makefile                 | 7 +++++++
 ci/prebuild.yml          | 8 +-------
 common/tools/cointool.py | 4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 27586f476..47411a9d6 100644
--- a/Makefile
+++ b/Makefile
@@ -39,3 +39,10 @@ cstyle_check: ## run code style check on low-level C code
 cstyle: ## apply code style on low-level C code
 	@echo [CLANG-FORMAT]
 	@clang-format -i $(C_FILES)
+
+defs_check: ## check validity of coin definitions and protobuf files
+	jsonlint common/defs/*.json common/defs/*/*.json
+	python3 common/tools/cointool.py check
+	python3 common/tools/support.py check --ignore-missing
+	python3 common/protob/check.py
+	python3 common/protob/graph.py common/protob/*.proto
diff --git a/ci/prebuild.yml b/ci/prebuild.yml
index ac83fb64c..11318696f 100644
--- a/ci/prebuild.yml
+++ b/ci/prebuild.yml
@@ -9,10 +9,4 @@ prebuild style:
 prebuild common:
   stage: prebuild
   script:
-    - cd common
-    - pipenv run jsonlint defs/*.json
-    - pipenv run jsonlint defs/*/*.json
-    - pipenv run python tools/cointool.py check
-    - pipenv run python tools/support.py check --ignore-missing
-    - pipenv run python protob/check.py
-    - pipenv run python protob/graph.py protob/*.proto  # TODO: artifacts?
+    - pipenv run make defs_check
diff --git a/common/tools/cointool.py b/common/tools/cointool.py
index fb60c2eb7..804819559 100755
--- a/common/tools/cointool.py
+++ b/common/tools/cointool.py
@@ -184,9 +184,9 @@ def check_eth(coins):
         print_log(logging.ERROR, chain_name_str, bucket_str)
         check_passed = False
     for coin in coins:
-        icon_file = "defs/ethereum/%s.png" % coin["shortcut"].lower()
+        icon_file = coin["shortcut"].lower() + ".png"
         try:
-            icon = Image.open(icon_file)
+            icon = Image.open(os.path.join(coin_info.DEFS_DIR, "ethereum", icon_file))
         except Exception:
             print(coin["key"], ": failed to open icon file", icon_file)
             check_passed = False