From 01213e34e24f8b5e0e71b5d5c9314c3a5f0ac49a Mon Sep 17 00:00:00 2001 From: Ahmed Muawia Khan Date: Thu, 13 Sep 2018 19:34:50 +0200 Subject: [PATCH] Address comments II - Update name of tm version check function - some typos --- bigchaindb/core.py | 4 ++-- bigchaindb/utils.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bigchaindb/core.py b/bigchaindb/core.py index 7800bc53..6032ea79 100644 --- a/bigchaindb/core.py +++ b/bigchaindb/core.py @@ -119,11 +119,11 @@ class App(BaseApplication): # Check if BigchainDB supports the Tendermint version try: - if check_tendermint_version(request.version): + if tendermint_version_is_compatible(request.version): logger.info(f"Tendermint version: {request.version}") else: logger.error(f"Error: Tendermint version {request.version} not supported." - f" Currently, BigchainDB only supports {__tm_supported_versions__} .Exiting!") + f" Currently, BigchainDB only supports {__tm_supported_versions__}. Exiting!") sys.exit(1) except AttributeError: logger.info("Tendermint version not found. Exiting!") diff --git a/bigchaindb/utils.py b/bigchaindb/utils.py index 0337f97e..57fcc4a0 100644 --- a/bigchaindb/utils.py +++ b/bigchaindb/utils.py @@ -188,7 +188,7 @@ def load_node_key(path): return key_pair_from_ed25519_key(hex_private_key) -def check_tendermint_version(running_tm_ver): +def tendermint_version_is_compatible(running_tm_ver): """ Check Tendermint compatability with BigchainDB server @@ -197,6 +197,8 @@ def check_tendermint_version(running_tm_ver): :return: True/False depending on the compatability with BigchainDB server :rtype: bool """ + + # Splitting because version can look like this e.g. 0.22.8-40d6dc2e tm_ver = running_tm_ver.split('-') if not tm_ver: return False