Correcting test failures

agatsoh · agatsoh · commit 06f7b0435d25 · 2018-06-11T18:12:07.000+05:30
diff --git a/etherscan/client.py b/etherscan/client.py
@@ -114,7 +114,8 @@ def connect(self):
             # Check for empty response
             if req.text:
                 data = req.json()
-                if data.get('status') == '1' or 'result' in data:
+                status = data.get('status')
+                if status == '1' or self.check_keys_api(data):
                     return data
                 else:
                     raise EmptyResponse(data.get('message', 'no message'))
@@ -125,3 +126,7 @@ def check_and_get_api(self):
             pass
         else:
             self.url_dict[self.API_KEY] = input('Please type your EtherScan.io API key: ')
+
+    def check_keys_api(self, data):
+        return all (k in data for k in ('jsonrpc', 'id', 'result'))
+    
diff --git a/tests/test_proxies.py b/tests/test_proxies.py
@@ -13,8 +13,8 @@ def test_get_most_recent_block(self):
         api = Proxies(api_key=API_KEY)
         # currently raises an exception even though it should not, see:
         # https://github.com/corpetty/py-etherscan-api/issues/32
-        with self.assertRaises(EmptyResponse):
-            most_recent = int(api.get_most_recent_block(), 16)
-            print(most_recent)
-            p = re.compile('^[0-9]{7}$')
-            self.assertTrue(p.match(str(most_recent)))
+        most_recent = int(api.get_most_recent_block(), 16)
+        print(most_recent)
+        p = re.compile('^[0-9]{7}$')
+        self.assertTrue(p.match(str(most_recent)))
+            
