Fix appbase detection and unit tests

beemapi/rpcutils.py

@@ -18,10 +18,9 @@ def is_network_appbase_ready(props):
     """Checks if the network is appbase ready"""
     network_version = '0.0.0'
     if "STEEMIT_BLOCKCHAIN_VERSION" in props:
-        network_version = props['STEEMIT_BLOCKCHAIN_VERSION']
+        return False
     elif "STEEM_BLOCKCHAIN_VERSION" in props:
-        network_version = props['STEEM_BLOCKCHAIN_VERSION']
-    return network_version == '0.19.10'
+        return True
 
 
 def get_query(appbase, request_id, api_name, name, args):

tests/beem/test_account.py

@@ -474,7 +474,7 @@ class Testcases(unittest.TestCase):
             content = self.bts.rpc.get_accounts([account["name"]])[0]
         keys = list(content.keys())
         json_content = account.json()
-        exclude_list = []  # ['json_metadata', 'reputation', 'active_votes', 'savings_sbd_seconds']
+        exclude_list = ['owner_challenged', 'average_bandwidth']  # ['json_metadata', 'reputation', 'active_votes', 'savings_sbd_seconds']
         for k in keys:
             if k not in exclude_list:
                 if isinstance(content[k], dict) and isinstance(json_content[k], list):

tests/beem/test_amount.py

@@ -125,16 +125,22 @@ class Testcases(unittest.TestCase):
     def test_json_appbase(self):
         asset = Asset("SBD", steem_instance=self.appbase)
         amount = Amount("1", asset, new_appbase_format=False, steem_instance=self.appbase)
-        self.assertEqual(
-            amount.json(),
-            [str(1 * 10 ** asset.precision), asset.precision, asset.asset])
+        if self.appbase.rpc.get_use_appbase():
+            self.assertEqual(
+                amount.json(),
+                [str(1 * 10 ** asset.precision), asset.precision, asset.asset])
+        else:
+            self.assertEqual(amount.json(), "1.000 SBD")
 
     def test_json_appbase2(self):
         asset = Asset("SBD", steem_instance=self.appbase)
         amount = Amount("1", asset, new_appbase_format=True, steem_instance=self.appbase)
-        self.assertEqual(
-            amount.json(),
-            {'amount': str(1 * 10 ** asset.precision), 'nai': asset.asset, 'precision': asset.precision})
+        if self.appbase.rpc.get_use_appbase():
+            self.assertEqual(
+                amount.json(),
+                {'amount': str(1 * 10 ** asset.precision), 'nai': asset.asset, 'precision': asset.precision})
+        else:
+            self.assertEqual(amount.json(), "1.000 SBD")
 
     def test_string(self):
         self.assertEqual(